diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-12 09:59:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 09:59:53 +0000 |
| commit | 8a2e3164130bce3a43b4c499db8c0cc6c4ae0c4d (patch) | |
| tree | 9aecae58476c7fa957324ea960bdcc4a24158c59 /synapse/app/homeserver.py | |
| parent | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) (diff) | |
| parent | fix tests (diff) | |
| download | synapse-8a2e3164130bce3a43b4c499db8c0cc6c4ae0c4d.tar.xz | |
Merge pull request #4613 from matrix-org/rav/deprecate_no_tls
Infer no_tls from presence of TLS listeners
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b4476bf16e..dbd98d394f 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -90,11 +90,6 @@ class SynapseHomeServer(HomeServer): tls = listener_config.get("tls", False) site_tag = listener_config.get("tag", port) - if tls and config.no_tls: - raise ConfigError( - "Listener on port %i has TLS enabled, but no_tls is set" % (port,), - ) - resources = {} for res in listener_config["resources"]: for name in res["names"]: |