diff options
author | Matthew Hodgson <matthew@matrix.org> | 2015-03-30 12:01:09 -0400 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2015-03-30 12:01:09 -0400 |
commit | 8366fde82f609448bd96a882c72cea7d2baa52f0 (patch) | |
tree | 1d16bf9713f69e86deaa209cb64452b09f3fb5cb /synapse/config | |
parent | Revert "Add another @cached wrapper, this time on get_presence_state()" (diff) | |
download | synapse-8366fde82f609448bd96a882c72cea7d2baa52f0.tar.xz |
turn --disable-registration into --enable-registration, given the default is for registration to be disabled by default now. this is backwards incompatible by removing the old --disable-registration arg, but makes for a much more intuitive arg
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/registration.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 4401e774d1..a6a2d2c5e1 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -25,11 +25,11 @@ class RegistrationConfig(Config): def __init__(self, args): super(RegistrationConfig, self).__init__(args) - # `args.disable_registration` may either be a bool or a string depending - # on if the option was given a value (e.g. --disable-registration=false - # would set `args.disable_registration` to "false" not False.) - self.disable_registration = bool( - distutils.util.strtobool(str(args.disable_registration)) + # `args.enable_registration` may either be a bool or a string depending + # on if the option was given a value (e.g. --enable-registration=true + # would set `args.enable_registration` to "true" not True.) + self.disable_registration = not bool( + distutils.util.strtobool(str(args.enable_registration)) ) self.registration_shared_secret = args.registration_shared_secret @@ -39,11 +39,11 @@ class RegistrationConfig(Config): reg_group = parser.add_argument_group("registration") reg_group.add_argument( - "--disable-registration", - const=True, - default=True, + "--enable-registration", + const=False, + default=False, nargs='?', - help="Disable registration of new users.", + help="Enable registration for new users.", ) reg_group.add_argument( "--registration-shared-secret", type=str, @@ -53,8 +53,8 @@ class RegistrationConfig(Config): @classmethod def generate_config(cls, args, config_dir_path): - if args.disable_registration is None: - args.disable_registration = True + if args.enable_registration is None: + args.enable_registration = False if args.registration_shared_secret is None: args.registration_shared_secret = random_string_with_symbols(50) |