aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-08-26 20:36:44 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-08-26 20:36:44 +0700
commit66c1966688e9bb24ce1703217b89d8ec390b6095 (patch)
treec93ba1ba5ca9131e33e8fef6384ee940ad3594e4
parent6dc24422dc403663f6385272f071e2223c24b2ce (diff)
downloadpleroma-66c1966688e9bb24ce1703217b89d8ec390b6095.tar.gz
Disable rate limiter by default
-rw-r--r--config/config.exs11
-rw-r--r--docs/config.md2
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.