Fix macaroon_secret_key fallback logic

rubo77 · Jan 10, 2019 · efc522c · efc522c
1 parent 566947f
commit efc522c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/synapse/config/key.py b/synapse/config/key.py
@@ -71,14 +71,14 @@ def default_config(self, config_dir_path, server_name, is_generating_file=False,
         base_key_name = os.path.join(config_dir_path, server_name)
 
         if is_generating_file:
-            macaroon_secret_key = random_string_with_symbols(50)
+            macaroon_secret_key = '"%s"' % random_string_with_symbols(50)
             form_secret = '"%s"' % random_string_with_symbols(50)
         else:
-            macaroon_secret_key = None
+            macaroon_secret_key = 'null'
             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