summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-06 14:46:31 +0100
committerErik Johnston <erik@matrix.org>2016-07-06 14:46:31 +0100
commita17e7caeb708f267e8ac2b18404a098e90792834 (patch)
tree2dee0e30691c1a9fd30ee9d674c8c5a6cfe7e7de /synapse/config
parentAdd ReadWriteLock for pagination and history prune (diff)
parentCheck that there are no null bytes in user and passsword (diff)
downloadsynapse-a17e7caeb708f267e8ac2b18404a098e90792834.tar.xz
Merge branch 'erikj/shared_secret' into erikj/test2
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/password.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/password.py b/synapse/config/password.py
index dec801ef41..66f0d93eea 100644
--- a/synapse/config/password.py
+++ b/synapse/config/password.py
@@ -23,10 +23,14 @@ class PasswordConfig(Config):
     def read_config(self, config):
         password_config = config.get("password_config", {})
         self.password_enabled = password_config.get("enabled", True)
+        self.password_pepper = password_config.get("pepper", "")
 
     def default_config(self, config_dir_path, server_name, **kwargs):
         return """
         # Enable password for login.
         password_config:
            enabled: true
+           # Change to a secret random string.
+           # DO NOT CHANGE THIS AFTER INITIAL SETUP!
+           #pepper: ""
         """