Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix macaroon_secret_key fallback logic" 

This is already fixed in 0.34.1, by 59f93bb

This reverts commit efc522c55e.
This commit is contained in:
Richard van der Hoff 2019-01-10 14:09:26 +00:00
parent 4f24452ead
commit ba41aeed6a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/config/key.py
View File

@ -71,14 +71,14 @@ class KeyConfig(Config):
base_key_name = os.path.join(config_dir_path, server_name) base_key_name = os.path.join(config_dir_path, server_name)
if is_generating_file: 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) form_secret = '"%s"' % random_string_with_symbols(50)
else: else:
macaroon_secret_key = 'null' macaroon_secret_key = None
form_secret = 'null' form_secret = 'null'
return """\ return """\
macaroon_secret_key: %(macaroon_secret_key)s macaroon_secret_key: "%(macaroon_secret_key)s"
# Used to enable access token expiration. # Used to enable access token expiration.
expire_access_token: False expire_access_token: False