summary refs log tree commit diff
path: root/synapse/config/tls.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-22 00:00:20 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-24 14:14:52 +0100
commit16b52642e274054a070fb494684547a77790c22b (patch)
treedf8d390407e6848473d38f3589d8ae4d5aa1a5a4 /synapse/config/tls.py
parentEnsure that all config options have sensible defaults (diff)
downloadsynapse-16b52642e274054a070fb494684547a77790c22b.tar.xz
Don't load the generated config as the default.
It's too confusing.
Diffstat (limited to 'synapse/config/tls.py')
-rw-r--r--synapse/config/tls.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index 9a66e8cc4b..8fcf801418 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -217,7 +217,9 @@ class TlsConfig(Config):
             if sha256_fingerprint not in sha256_fingerprints:
                 self.tls_fingerprints.append({"sha256": sha256_fingerprint})
 
-    def default_config(self, config_dir_path, server_name, data_dir_path, **kwargs):
+    def generate_config_section(
+        self, config_dir_path, server_name, data_dir_path, **kwargs
+    ):
         base_key_name = os.path.join(config_dir_path, server_name)
 
         tls_certificate_path = base_key_name + ".tls.crt"