summary refs log tree commit diff
path: root/synapse/config/registration.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-03-05 18:03:14 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-03-05 18:03:14 +0000
commit067ce795c06f3ac5ebc25e4d01624b076a972f76 (patch)
tree5520974c4d248be39a7b8a1968a7f7215fdf7db3 /synapse/config/registration.py
parentMerge pull request #4772 from jbweston/jbweston/server-version-api (diff)
downloadsynapse-067ce795c06f3ac5ebc25e4d01624b076a972f76.tar.xz
Move settings from registration to ratelimiting in config file
Diffstat (limited to '')
-rw-r--r--synapse/config/registration.py20
1 files changed, 2 insertions, 18 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index d32f6fff73..d34dc9e456 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -54,13 +54,6 @@ class RegistrationConfig(Config):
             config.get("disable_msisdn_registration", False)
         )
 
-        self.rc_registration_requests_per_second = config.get(
-            "rc_registration_requests_per_second", 0.17,
-        )
-        self.rc_registration_request_burst_count = config.get(
-            "rc_registration_request_burst_count", 3,
-        )
-
     def default_config(self, generate_secrets=False, **kwargs):
         if generate_secrets:
             registration_shared_secret = 'registration_shared_secret: "%s"' % (
@@ -71,6 +64,8 @@ class RegistrationConfig(Config):
 
         return """\
         ## Registration ##
+        # Registration can be rate-limited using the parameters in the "Ratelimiting"
+        # section of this file.
 
         # Enable registration for new users.
         enable_registration: False
@@ -147,17 +142,6 @@ class RegistrationConfig(Config):
         # users cannot be auto-joined since they do not exist.
         #
         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
         """ % locals()
 
     def add_arguments(self, parser):