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

Fix bug where synapse fails to start if no_tls set

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 019b91576f..250a17cef8 100755
--- 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"]: