diff options
| author | lain <lain@soykaf.club> | 2019-06-11 11:32:01 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-11 11:32:01 +0000 |
| commit | 63ab3c30ebb33241074cb252c449cd7879b77870 (patch) | |
| tree | 31221764c19bfc33cf74639898a9148ae8fe06cd /config | |
| parent | 3e3dcd223d9525fe63c84d0dc62a793c6661bbbe (diff) | |
| parent | 7c063a898d60cadd324087999226314586b72bd3 (diff) | |
| download | pleroma-63ab3c30ebb33241074cb252c449cd7879b77870.tar.gz pleroma-63ab3c30ebb33241074cb252c449cd7879b77870.zip | |
Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 95a0e9972..0642ee3c3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -247,8 +247,6 @@ config :pleroma, :instance, skip_thread_containment: true, limit_unauthenticated_to_local_content: true -config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800 - config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because # of custom emoji. Issue #275 discusses defanging that somehow. @@ -505,6 +503,10 @@ 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} + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/test.exs b/config/test.exs index 6d4fcf7d0..1c5eff794 100644 --- a/config/test.exs +++ b/config/test.exs @@ -60,7 +60,7 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false -config :pleroma, :app_account_creation, max_requests: 5 +config :pleroma, :rate_limit, app_account_creation: {1000, 5} config :pleroma, :http_security, report_uri: "https://endpoint.com" |