diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-24 16:01:57 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-24 16:01:57 +0000 |
| commit | 83aeb6090072986d39dc52de05f5a23164f8ce04 (patch) | |
| tree | 1f510711f7bad7b69df9d3c2d01f3663d4e126fb /config | |
| parent | bc78a875c86db42d67122cfb767f239a55dacbea (diff) | |
| parent | 1d7033d96289edf0adf2ca61a725f93b345305ec (diff) | |
| download | pleroma-83aeb6090072986d39dc52de05f5a23164f8ce04.tar.gz pleroma-83aeb6090072986d39dc52de05f5a23164f8ce04.zip | |
Merge branch 'activity-expiration' into 'develop'
Activity expiration
See merge request pleroma/pleroma!1595
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 118f697b3..e58454d68 100644 --- a/config/config.exs +++ b/config/config.exs @@ -456,6 +456,7 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue, max_retries: 5 config :pleroma_job_queue, :queues, + activity_expiration: 10, federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -566,6 +567,8 @@ config :pleroma, :rate_limit, account_confirmation_resend: {8_640_000, 5}, ap_routes: {60_000, 15} +config :pleroma, Pleroma.ActivityExpiration, enabled: true + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/test.exs b/config/test.exs index 30a51f734..567780987 100644 --- a/config/test.exs +++ b/config/test.exs @@ -86,11 +86,10 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock -try do +if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" -rescue - _ -> - IO.puts( - "You may want to create test.secret.exs to declare custom database connection parameters." - ) +else + IO.puts( + "You may want to create test.secret.exs to declare custom database connection parameters." + ) end |