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/tls.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/tls.py')
| -rw-r--r-- | synapse/config/tls.py | 4 |
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" |