Merge pull request #4524 from matrix-org/erikj/fix_no_tls

Fix bug where synapse fails to start if no_tls set
2019-01-30 13:11:05 +00:00 · 2019-01-30 13:11:05 +00:00 · 43c6fca960
parent a79034aedf e87d7a4b0f
commit 43c6fca960
2 changed files with 4 additions and 1 deletions
--- a/changelog.d/4524.feature
+++ b/changelog.d/4524.feature
@ -0,0 +1 @@
+Synapse will now reload TLS certificates from disk upon SIGHUP.
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@ -95,7 +95,9 @@ class SynapseHomeServer(HomeServer):
        site_tag = listener_config.get("tag", port)

        if tls and config.no_tls:
-            return
+            raise ConfigError(
+                "Listener on port %i has TLS enabled, but no_tls is set" % (port,),
+            )

        resources = {}
        for res in listener_config["resources"]:
				`@ -0,0 +1 @@`
				`Synapse will now reload TLS certificates from disk upon SIGHUP.`