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 | |
| 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')
| -rw-r--r-- | synapse/app/_base.py | 11 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index e1fc1afd5b..50fd17c0be 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -213,13 +213,16 @@ def refresh_certificate(hs): Refresh the TLS certificates that Synapse is using by re-reading them from disk and updating the TLS context factories to use them. """ - logging.info("Loading certificate from disk...") hs.config.read_certificate_from_disk() + + if not hs.config.has_tls_listener(): + # nothing else to do here + return + hs.tls_server_context_factory = context_factory.ServerContextFactory(hs.config) - logging.info("Certificate loaded.") if hs._listening_services: - logging.info("Updating context factories...") + logger.info("Updating context factories...") for i in hs._listening_services: # When you listenSSL, it doesn't make an SSL port but a TCP one with # a TLS wrapping factory around the factory you actually want to get @@ -234,7 +237,7 @@ def refresh_certificate(hs): False, i.factory.wrappedFactory ) - logging.info("Context factories updated.") + logger.info("Context factories updated.") def start(hs, listeners=None): 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"]: |