diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
| commit | dc4b23e1a102071227288bb9d2ad77611f0d34c8 (patch) | |
| tree | c1147b1f393c416daa7fd8855850e42caf9d9956 /synapse/config | |
| parent | Stop generating refresh tokens (diff) | |
| parent | Merge pull request #1660 from matrix-org/rav/better_content_type_validation (diff) | |
| download | synapse-dc4b23e1a102071227288bb9d2ad77611f0d34c8.tar.xz | |
Merge branch 'develop' into rav/no_more_refresh_tokens
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/registration.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index cc3f879857..87e500c97a 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -32,7 +32,6 @@ class RegistrationConfig(Config): ) self.registration_shared_secret = config.get("registration_shared_secret") - self.user_creation_max_duration = int(config["user_creation_max_duration"]) self.bcrypt_rounds = config.get("bcrypt_rounds", 12) self.trusted_third_party_id_servers = config["trusted_third_party_id_servers"] @@ -55,11 +54,6 @@ class RegistrationConfig(Config): # secret, even if registration is otherwise disabled. registration_shared_secret: "%(registration_shared_secret)s" - # Sets the expiry for the short term user creation in - # milliseconds. For instance the bellow duration is two weeks - # in milliseconds. - user_creation_max_duration: 1209600000 - # Set the number of bcrypt rounds used to generate password hash. # Larger numbers increase the work factor needed to generate the hash. # The default number of rounds is 12. |