summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-31 14:34:42 +0100
committerErik Johnston <erik@matrix.org>2020-07-31 15:06:56 +0100
commit18de00adb4471a55b504f4afb9f29facf0a51785 (patch)
treeeb2980609580bb8c4ae5a6bc3b152d6571d2fd40 /docs
parentFix formatting of changelog and upgrade notes (diff)
downloadsynapse-18de00adb4471a55b504f4afb9f29facf0a51785.tar.xz
Add ratelimiting on joins
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index b21e36bb6d..fef503479e 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -731,6 +731,10 @@ log_config: "CONFDIR/SERVERNAME.log.config"
 #   - one for ratelimiting redactions by room admins. If this is not explicitly
 #     set then it uses the same ratelimiting as per rc_message. This is useful
 #     to allow room admins to deal with abuse quickly.
+#   - two for ratelimiting number of rooms a user can join, "local" for when
+#     users are joining rooms the server is already in (this is cheap) vs
+#     "remote" for when users are trying to join rooms not on the server (which
+#     can be more expensive)
 #
 # The defaults are as shown below.
 #
@@ -756,6 +760,14 @@ log_config: "CONFDIR/SERVERNAME.log.config"
 #rc_admin_redaction:
 #  per_second: 1
 #  burst_count: 50
+#
+#rc_joins:
+#  local:
+#    per_second: 0.1
+#    burst_count: 3
+#  remote:
+#    per_second: 0.01
+#    burst_count: 3
 
 
 # Ratelimiting settings for incoming federation