diff options
| author | lambda <lain@soykaf.club> | 2019-05-14 20:33:35 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-14 20:33:35 +0000 |
| commit | c133c32ef07077daaf581a4f890939b38c1d7feb (patch) | |
| tree | 420e3e7a0653052dff007d1652b87867bbb43db6 /config | |
| parent | 8e721706c2fd06f890c055cf4d13056c653a0aa6 (diff) | |
| parent | 2ca8d20053ef2abda070b8aba0e6937cf2f07991 (diff) | |
| download | pleroma-c133c32ef07077daaf581a4f890939b38c1d7feb.tar.gz pleroma-c133c32ef07077daaf581a4f890939b38c1d7feb.zip | |
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
See merge request pleroma/pleroma!1154
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 8d44c96de..32c7fecb8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -239,7 +239,7 @@ config :pleroma, :instance, safe_dm_mentions: false, healthcheck: false -config :pleroma, :app_account_creation, enabled: false, max_requests: 5, interval: 1800 +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 diff --git a/config/test.exs b/config/test.exs index f93bc5994..a0c90c371 100644 --- a/config/test.exs +++ b/config/test.exs @@ -59,6 +59,8 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false +config :pleroma, :app_account_creation, max_requests: 5 + try do import_config "test.secret.exs" rescue |