summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-02-03 21:42:36 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-02-03 21:42:36 +0300
commit2c40c8b4a2890e60abe8d67a3c8af4a88d225b60 (patch)
treebe7ff77c4af8b1264c57e8aa8161e80396ca3fbc /config
parent21a2a054070c26d7be1a0e453e5f40b20fbd59f2 (diff)
parentc27d1d65bfd60effdb45359697141c136e156177 (diff)
downloadpleroma-2c40c8b4a2890e60abe8d67a3c8af4a88d225b60.tar.gz
pleroma-2c40c8b4a2890e60abe8d67a3c8af4a88d225b60.zip
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
-rw-r--r--config/config.exs14
1 files changed, 12 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 696b8ebf4..98a44efb0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -586,11 +586,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