From 270f212a2a89712e78ff2ff4922c2f99285d65dc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 30 Jan 2019 12:14:50 +0000 Subject: [PATCH 1/3] _listener_http should return a list --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 019b91576f..d5f5ff9599 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -95,7 +95,7 @@ class SynapseHomeServer(HomeServer): site_tag = listener_config.get("tag", port) if tls and config.no_tls: - return + return [] resources = {} for res in listener_config["resources"]: From e6a7a15f9325089cc865ff0d674803c7b315bdf5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 30 Jan 2019 12:17:38 +0000 Subject: [PATCH 2/3] Newsfile --- changelog.d/4524.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4524.feature diff --git a/changelog.d/4524.feature b/changelog.d/4524.feature new file mode 100644 index 0000000000..fc2b5daf63 --- /dev/null +++ b/changelog.d/4524.feature @@ -0,0 +1 @@ +Synapse will now reload TLS certificates from disk upon SIGHUP. From e87d7a4b0f946ec6723138e48f4bd7aae8389a5d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 30 Jan 2019 12:48:09 +0000 Subject: [PATCH 3/3] Raise ConfigError instead --- synapse/app/homeserver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index d5f5ff9599..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"]: