summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-02-28 17:44:59 +0300
committerrinpatch <rinpatch@sdf.org>2020-03-01 01:13:08 +0300
commitffcebe7e22b4c5ccaf3ba63f3ed2885ac55a6b4d (patch)
treea74b9123bd1ce852b4c17e39c3db94fb7a876a68 /config
parent4d416343fae4a9e0b1654b12bd476017be63a7e9 (diff)
downloadpleroma-ffcebe7e22b4c5ccaf3ba63f3ed2885ac55a6b4d.tar.gz
pleroma-ffcebe7e22b4c5ccaf3ba63f3ed2885ac55a6b4d.zip
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
Diffstat (limited to 'config')
-rw-r--r--config/config.exs1
-rw-r--r--config/description.exs6
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 0dde1fc85..9c4eb70a3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -599,6 +599,7 @@ config :http_signatures,
config :pleroma, :rate_limit,
authentication: {60_000, 15},
+ timeline: {500, 3},
search: [{1000, 10}, {1000, 30}],
app_account_creation: {1_800_000, 25},
relations_actions: {10_000, 10},
diff --git a/config/description.exs b/config/description.exs
index bcb69bc41..9fdcfcd96 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2466,6 +2466,12 @@ config :pleroma, :config_description, [
suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
},
%{
+ key: :timeline,
+ type: [:tuple, {:list, :tuple}],
+ description: "For requests to timelines (each timeline has it's own limiter)",
+ suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
+ },
+ %{
key: :app_account_creation,
type: [:tuple, {:list, :tuple}],
description: "For registering user accounts from the same IP address",