Merge pull request #5523 from matrix-org/rav/arg_defaults

Stop conflating generated config and default config
This commit is contained in:
Richard van der Hoff 2019-06-24 17:24:35 +01:00 committed by GitHub
commit af8a962905
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 88 additions and 107 deletions

View file

@ -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