diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 14 | ||||
| -rw-r--r-- | config/test.exs | 11 |
2 files changed, 9 insertions, 16 deletions
diff --git a/config/config.exs b/config/config.exs index 9a8c69448..da89aa3e9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -472,6 +472,7 @@ config :pleroma, Oban, verbose: false, prune: {:maxage, 60 * 60 * 24 * 7}, queues: [ + activity_expiration: 10, federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -578,16 +579,9 @@ config :pleroma, :env, Mix.env() config :http_signatures, adapter: Pleroma.Signature -config :pleroma, :rate_limit, - search: [{1000, 10}, {1000, 30}], - app_account_creation: {1_800_000, 25}, - relations_actions: {10_000, 10}, - relation_id_action: {60_000, 2}, - statuses_actions: {10_000, 15}, - status_id_action: {60_000, 3}, - password_reset: {1_800_000, 5}, - account_confirmation_resend: {8_640_000, 5}, - ap_routes: {60_000, 15} +config :pleroma, :rate_limit, nil + +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. diff --git a/config/test.exs b/config/test.exs index 62f2a04d2..0ef809ac1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -88,11 +88,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 |