diff options
| author | lain <lain@soykaf.club> | 2019-10-07 12:30:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-07 12:30:59 +0200 |
| commit | 73b6512907d205d4be49864541eeb941d259aa57 (patch) | |
| tree | 8441ec250a7e7681b12bdc756df46a9870793149 /config | |
| parent | 91e90aa807c2ce346cd453201447806fb71b21fe (diff) | |
| parent | 93bdc55306895dce0554e7838ecf2ea7ddaea3a7 (diff) | |
| download | pleroma-73b6512907d205d4be49864541eeb941d259aa57.tar.gz pleroma-73b6512907d205d4be49864541eeb941d259aa57.zip | |
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index ddbfb246a..cf94f1a19 100644 --- a/config/config.exs +++ b/config/config.exs @@ -588,7 +588,7 @@ config :pleroma, :env, Mix.env() config :http_signatures, adapter: Pleroma.Signature -config :pleroma, :rate_limit, nil +config :pleroma, :rate_limit, authentication: {60_000, 15} config :pleroma, Pleroma.ActivityExpiration, enabled: true diff --git a/config/description.exs b/config/description.exs index 4547ea368..b007cf69c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2290,7 +2290,8 @@ config :pleroma, :config_description, [ group: :pleroma, key: :rate_limit, type: :group, - description: "Rate limit settings. This is an advanced feature and disabled by default.", + description: + "Rate limit settings. This is an advanced feature enabled only for :authentication by default.", children: [ %{ key: :search, @@ -2329,6 +2330,12 @@ config :pleroma, :config_description, [ description: "for fav / unfav or reblog / unreblog actions on the same status by the same user", suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]] + }, + %{ + key: :authentication, + type: [:tuple, {:list, :tuple}], + description: "for authentication create / password check / user existence check requests", + suggestions: [{60_000, 15}] } ] }, |