diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 14:34:09 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 14:34:09 +0100 |
| commit | c9e62927f29991ca32e21215e6647b37962c84dc (patch) | |
| tree | 2cecb7841ba5a6ffda34589f7d589067b53f45c7 /synapse | |
| parent | Allow multiple config files, set up a default config before applying the conf... (diff) | |
| download | synapse-c9e62927f29991ca32e21215e6647b37962c84dc.tar.xz | |
Use disable_registration keys if they are present
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/registration.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 82684e4dc9..095c3d3b00 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -26,6 +26,11 @@ class RegistrationConfig(Config): self.disable_registration = not bool( distutils.util.strtobool(str(config["enable_registration"])) ) + if "disable_registration" in config: + self.disable_registration = bool( + distutils.util.strtobool(str(config["disable_registration"])) + ) + self.registration_shared_secret = config.get("registration_shared_secret") def default_config(self, config_dir, server_name): |