summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-10-07 15:41:41 +0300
committerMaxim Filippov <colixer@gmail.com>2019-10-07 15:41:41 +0300
commit35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch)
tree0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /config/description.exs
parent7aceaa517be7b109a9acc15fb4914535b536b66c (diff)
parent0a99f1e8c5551dcf170722e5087a0401b2d907af (diff)
downloadpleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz
pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.zip
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs9
1 files changed, 8 insertions, 1 deletions
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}]
}
]
},