diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-11 16:06:03 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-11 16:06:03 +0700 |
| commit | ad04d12de63d559cc6398c58296afd04321adfbc (patch) | |
| tree | efd3139c6cc9f6a838f2317723aa4ca6ae1d34b0 /config | |
| parent | f26013cf2ee9c04d4b99819991aaa5936e41cba4 (diff) | |
| download | pleroma-ad04d12de63d559cc6398c58296afd04321adfbc.tar.gz pleroma-ad04d12de63d559cc6398c58296afd04321adfbc.zip | |
Replace `MastodonAPIController.account_register/2` rate limiter
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index d20d4fda9..3d2c6d48e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -247,8 +247,6 @@ config :pleroma, :instance, skip_thread_containment: false, 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. @@ -503,7 +501,9 @@ config :pleroma, :database, rum_enabled: false config :http_signatures, adapter: Pleroma.Signature -config :pleroma, :rate_limit, search: [{1000, 10}, {1000, 30}] +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. diff --git a/config/test.exs b/config/test.exs index 7861b9598..95129f409 100644 --- a/config/test.exs +++ b/config/test.exs @@ -59,7 +59,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" |