summary refs log tree commit diff
path: root/docs/sample_config.yaml
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-31 18:21:48 +0100
committerGitHub <noreply@github.com>2020-07-31 18:21:48 +0100
commit394be6a0e69195cefc4b234dc41e670799dd46d4 (patch)
tree9fca4c5ed30c77c43023d9b365a37ec90261f2b4 /docs/sample_config.yaml
parentAdd docs for undoing room shutdowns (#7998) (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l... (diff)
downloadsynapse-394be6a0e69195cefc4b234dc41e670799dd46d4.tar.xz
Merge pull request #8008 from matrix-org/erikj/add_rate_limiting_to_joins
Add ratelimiting on joins
Diffstat (limited to 'docs/sample_config.yaml')
-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 341bd2f858..fe85978a1f 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -746,6 +746,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.
 #
@@ -771,6 +775,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