diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-30 13:11:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 13:11:05 +0000 |
| commit | 43c6fca960fc462a9f1d499cf173795e2c835efb (patch) | |
| tree | ac005d47e9a690694c54cc9fbed0ba5f7cea5131 | |
| parent | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanups (diff) | |
| parent | Raise ConfigError instead (diff) | |
| download | synapse-43c6fca960fc462a9f1d499cf173795e2c835efb.tar.xz | |
Merge pull request #4524 from matrix-org/erikj/fix_no_tls
Fix bug where synapse fails to start if no_tls set
| -rw-r--r-- | changelog.d/4524.feature | 1 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
2 files changed, 4 insertions, 1 deletions
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. 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"]: |