summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-02-03 14:55:54 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-02-03 14:55:54 +0000
commit66bb255fcd0173ed50a3b1067ac097353512b6a7 (patch)
treed6e60017335d1ab34f8e8d5c2fd6e8e4ad988096 /synapse/config
parentMerge pull request #552 from matrix-org/erikj/public_room_fix (diff)
parentRename config field to reflect yaml name (diff)
downloadsynapse-66bb255fcd0173ed50a3b1067ac097353512b6a7.tar.xz
Merge pull request #556 from matrix-org/daniel/config
Rename config field to reflect yaml name
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/registration.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 76d2d2d640..90ea19bd4b 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -23,11 +23,11 @@ from distutils.util import strtobool
 class RegistrationConfig(Config):
 
     def read_config(self, config):
-        self.disable_registration = not bool(
+        self.enable_registration = bool(
             strtobool(str(config["enable_registration"]))
         )
         if "disable_registration" in config:
-            self.disable_registration = bool(
+            self.enable_registration = not bool(
                 strtobool(str(config["disable_registration"]))
             )
 
@@ -78,6 +78,6 @@ class RegistrationConfig(Config):
 
     def read_arguments(self, args):
         if args.enable_registration is not None:
-            self.disable_registration = not bool(
+            self.enable_registration = bool(
                 strtobool(str(args.enable_registration))
             )