diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-26 14:01:51 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-26 14:01:51 +0000 |
| commit | 8c7b1c076cafe11a5e75dadc4ef7814fca4344fc (patch) | |
| tree | c93ba1ba5ca9131e33e8fef6384ee940ad3594e4 | |
| parent | 6dc24422dc403663f6385272f071e2223c24b2ce (diff) | |
| parent | 66c1966688e9bb24ce1703217b89d8ec390b6095 (diff) | |
| download | pleroma-8c7b1c076cafe11a5e75dadc4ef7814fca4344fc.tar.gz pleroma-8c7b1c076cafe11a5e75dadc4ef7814fca4344fc.zip | |
Merge branch 'disable-rate-limiter' into 'develop'
Disable rate limiter by default
Closes #1217
See merge request pleroma/pleroma!1601
| -rw-r--r-- | config/config.exs | 11 | ||||
| -rw-r--r-- | docs/config.md | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index e58454d68..f630771a3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -556,16 +556,7 @@ 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 diff --git a/docs/config.md b/docs/config.md index 414b54660..61aa7db9b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -671,6 +671,8 @@ This will probably take a long time. ## :rate_limit +This is an advanced feature and disabled by default. + A keyword list of rate limiters where a key is a limiter name and value is the limiter configuration. The basic configuration is a tuple where: * The first element: `scale` (Integer). The time scale in milliseconds. |