summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-24 17:24:35 +0100
committerGitHub <noreply@github.com>2019-06-24 17:24:35 +0100
commitaf8a9629057942d4dfa919df90d76d1fdc549606 (patch)
treef404909096abfe3635a02568f5ff02d79e7126f6 /synapse/config/server.py
parentMerge pull request #5499 from matrix-org/rav/cleanup_metrics (diff)
parentchangelog (diff)
downloadsynapse-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/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 7cbb699a66..7b51015119 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -327,7 +327,7 @@ class ServerConfig(Config):
     def has_tls_listener(self):
         return any(l["tls"] for l in self.listeners)
 
-    def default_config(self, server_name, data_dir_path, **kwargs):
+    def generate_config_section(self, server_name, data_dir_path, **kwargs):
         _, bind_port = parse_and_validate_server_name(server_name)
         if bind_port is not None:
             unsecure_port = bind_port - 400