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

Fix bug where synapse fails to start if no_tls set
matrix-org · Jan 30, 2019 · 43c6fca · 43c6fca
2 parents a79034a + e87d7a4
commit 43c6fca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/4524.feature b/changelog.d/4524.feature
@@ -0,0 +1 @@
+Synapse will now reload TLS certificates from disk upon SIGHUP.
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
@@ -95,7 +95,9 @@ def _listener_http(self, config, listener_config):
         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"]: