diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-24 17:24:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 17:24:35 +0100 |
| commit | af8a9629057942d4dfa919df90d76d1fdc549606 (patch) | |
| tree | f404909096abfe3635a02568f5ff02d79e7126f6 /synapse/config/password.py | |
| parent | Merge pull request #5499 from matrix-org/rav/cleanup_metrics (diff) | |
| parent | changelog (diff) | |
| download | synapse-af8a9629057942d4dfa919df90d76d1fdc549606.tar.xz | |
Merge pull request #5523 from matrix-org/rav/arg_defaults
Stop conflating generated config and default config
Diffstat (limited to 'synapse/config/password.py')
| -rw-r--r-- | synapse/config/password.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/password.py b/synapse/config/password.py index 300b67f236..598f84fc0c 100644 --- a/synapse/config/password.py +++ b/synapse/config/password.py @@ -28,7 +28,7 @@ class PasswordConfig(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): + def generate_config_section(self, config_dir_path, server_name, **kwargs): return """\ password_config: # Uncomment to disable password login |