diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 11:03:47 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 11:03:47 +0100 |
| commit | ade5342752498867140630f014c692787cbbedc9 (patch) | |
| tree | 1741b76d4e4f06c81ff290c688d196a51d020fd5 /synapse/config | |
| parent | Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms (diff) | |
| parent | Merge branch 'develop' into auth (diff) | |
| download | synapse-ade5342752498867140630f014c692787cbbedc9.tar.xz | |
Merge branch 'auth' into refresh
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): |