Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes

2019-01-30 13:11:25 +00:00
parent d351be1567 43c6fca960
commit ca46dcf683
2 changed files with 4 additions and 1 deletions
@@ -0,0 +1 @@
+Synapse will now reload TLS certificates from disk upon SIGHUP.
@@ -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.`