diff options
| author | lain <lain@soykaf.club> | 2020-01-30 18:47:44 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-30 18:47:44 +0000 |
| commit | 774cba84f50b7ebc4eef3406467aafa5fa76dff7 (patch) | |
| tree | 3a6d7d262fc798a73e33e73c46bb8bae45781d64 /config/config.exs | |
| parent | e52e78a93731db46f35552d79db1d9083be0235f (diff) | |
| parent | 01537cc1d6a290f6a9002b331b18986036300634 (diff) | |
| download | pleroma-774cba84f50b7ebc4eef3406467aafa5fa76dff7.tar.gz pleroma-774cba84f50b7ebc4eef3406467aafa5fa76dff7.zip | |
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index f4e307e18..c57ef1bf7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -596,11 +596,21 @@ config :pleroma, :env, Mix.env() config :http_signatures, adapter: Pleroma.Signature -config :pleroma, :rate_limit, authentication: {60_000, 15} +config :pleroma, :rate_limit, + authentication: {60_000, 15}, + 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, Pleroma.ActivityExpiration, enabled: true -config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false +config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true config :pleroma, :static_fe, enabled: false |