diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-10 14:09:26 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-10 14:09:26 +0000 |
| commit | ba41aeed6a6565e3c5348aaa568f5fd30e42e97a (patch) | |
| tree | ecc6d76eaa5b4af89be5324899c75b00fbbd801c /synapse | |
| parent | changelog (diff) | |
| download | synapse-ba41aeed6a6565e3c5348aaa568f5fd30e42e97a.tar.xz | |
Revert "Fix macaroon_secret_key fallback logic"
This is already fixed in 0.34.1, by 59f93bb This reverts commit efc522c55e996e420271de2d9094835dda52ade4.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/key.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index c26b7529f2..a7998c941d 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -71,14 +71,14 @@ class KeyConfig(Config): base_key_name = os.path.join(config_dir_path, server_name) if is_generating_file: - macaroon_secret_key = '"%s"' % random_string_with_symbols(50) + macaroon_secret_key = random_string_with_symbols(50) form_secret = '"%s"' % random_string_with_symbols(50) else: - macaroon_secret_key = 'null' + macaroon_secret_key = None form_secret = 'null' return """\ - macaroon_secret_key: %(macaroon_secret_key)s + macaroon_secret_key: "%(macaroon_secret_key)s" # Used to enable access token expiration. expire_access_token: False |