diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-20 17:25:42 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-20 17:25:42 +0100 |
commit | f483340b3e20ab19129f9c0ae6b0a1395d8ef762 (patch) | |
tree | 3097406bf9bcae62e0d3c2d16476bb525764a59d /synapse/config | |
parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
parent | Remove incorrect whitespace (diff) | |
download | synapse-f483340b3e20ab19129f9c0ae6b0a1395d8ef762.tar.xz |
Merge pull request #229 from matrix-org/auth
Issue macaroons as opaque auth tokens
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/registration.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 67e780864e..62de4b399f 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -32,9 +32,11 @@ class RegistrationConfig(Config): ) self.registration_shared_secret = config.get("registration_shared_secret") + self.macaroon_secret_key = config.get("macaroon_secret_key") def default_config(self, config_dir, server_name): registration_shared_secret = random_string_with_symbols(50) + macaroon_secret_key = random_string_with_symbols(50) return """\ ## Registration ## @@ -44,6 +46,8 @@ class RegistrationConfig(Config): # If set, allows registration by anyone who also has the shared # secret, even if registration is otherwise disabled. registration_shared_secret: "%(registration_shared_secret)s" + + macaroon_secret_key: "%(macaroon_secret_key)s" """ % locals() def add_arguments(self, parser): |