summary refs log tree commit diff
path: root/docs/sample_config.yaml
diff options
context:
space:
mode:
authorBrendan Abolivier <contact@brendanabolivier.com>2019-03-06 11:40:10 +0000
committerGitHub <noreply@github.com>2019-03-06 11:40:10 +0000
commit20dd3403eed144277a5b6c3561794d5028198a0e (patch)
treec6ba85a1c6738ac7afe21ac5f5c82eb9991eccbd /docs/sample_config.yaml
parentMerge pull request #4772 from jbweston/jbweston/server-version-api (diff)
parentMake registration ratelimiter separate from the main events one (diff)
downloadsynapse-20dd3403eed144277a5b6c3561794d5028198a0e.tar.xz
Merge pull request #4804 from matrix-org/babolivier/ratelimit_registration_improvements
Improve ratelimit on registration
Diffstat (limited to 'docs/sample_config.yaml')
-rw-r--r--docs/sample_config.yaml24
1 files changed, 13 insertions, 11 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index e0140003fd..3dd0b4a1a8 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -393,6 +393,17 @@ federation_rc_reject_limit: 50
 #
 federation_rc_concurrent: 3
 
+# Number of registration requests a client can send per second.
+# Defaults to 1/minute (0.17).
+#
+#rc_registration_requests_per_second: 0.17
+
+# Number of registration requests a client can send before being
+# throttled.
+# Defaults to 3.
+#
+#rc_registration_request_burst_count: 3.0
+
 
 
 # Directory where uploaded images and attachments are stored.
@@ -580,6 +591,8 @@ turn_allow_guests: True
 
 
 ## Registration ##
+# Registration can be rate-limited using the parameters in the "Ratelimiting"
+# section of this file.
 
 # Enable registration for new users.
 enable_registration: False
@@ -657,17 +670,6 @@ trusted_third_party_id_servers:
 #
 autocreate_auto_join_rooms: true
 
-# Number of registration requests a client can send per second.
-# Defaults to 1/minute (0.17).
-#
-#rc_registration_requests_per_second: 0.17
-
-# Number of registration requests a client can send before being
-# throttled.
-# Defaults to 3.
-#
-#rc_registration_request_burst_count: 3.0
-
 
 ## Metrics ###