OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/4534/head
Erik Johnston 2019-01-30 13:11:25 +00:00
parent d351be1567 43c6fca960
commit ca46dcf683
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4524.feature Normal file
View File

@ -0,0 +1 @@
Synapse will now reload TLS certificates from disk upon SIGHUP.

4
synapse/app/homeserver.py
View File

@ -95,7 +95,9 @@ class SynapseHomeServer(HomeServer):
site_tag = listener_config.get("tag", port) site_tag = listener_config.get("tag", port)
if tls and config.no_tls: if tls and config.no_tls:
return raise ConfigError(
"Listener on port %i has TLS enabled, but no_tls is set" % (port,),
)
resources = {} resources = {}
for res in listener_config["resources"]: for res in listener_config["resources"]: