forked from MirrorHub/synapse
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:
parent
4f24452ead
commit
ba41aeed6a
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue