From d7e27a1f08aefb020d1158d4b8210e995dcdac78 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Tue, 5 Feb 2019 11:32:45 +0000 Subject: fix typo in config comments (#4557) --- synapse/config/tls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse/config') diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 5f63676d9c..9498fc5f5b 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -199,10 +199,10 @@ class TlsConfig(Config): # If your server runs behind a reverse-proxy which terminates TLS connections # (for both client and federation connections), it may be useful to disable - # All TLS support for incoming connections. Setting no_tls to False will + # All TLS support for incoming connections. Setting no_tls to True will # do so (and avoid the need to give synapse a TLS private key). # - # no_tls: False + # no_tls: True # List of allowed TLS fingerprints for this server to publish along # with the signing keys for this server. Other matrix servers that -- cgit 1.5.1 From bf1e4d96ad22f246402241ef6dcabdebede50e10 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Tue, 5 Feb 2019 11:37:33 +0000 Subject: Fix default ACME config for py2 (#4564) Fixes #4559 --- changelog.d/4564.bugfix | 1 + synapse/config/tls.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/4564.bugfix (limited to 'synapse/config') diff --git a/changelog.d/4564.bugfix b/changelog.d/4564.bugfix new file mode 100644 index 0000000000..78e78504b4 --- /dev/null +++ b/changelog.d/4564.bugfix @@ -0,0 +1 @@ +Fix default ACME config for py2 diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 9498fc5f5b..b5f2cfd9b7 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -37,7 +37,7 @@ class TlsConfig(Config): self.acme_enabled = acme_config.get("enabled", False) self.acme_url = acme_config.get( - "url", "https://acme-v01.api.letsencrypt.org/directory" + "url", u"https://acme-v01.api.letsencrypt.org/directory" ) self.acme_port = acme_config.get("port", 80) self.acme_bind_addresses = acme_config.get("bind_addresses", ['::', '0.0.0.0']) -- cgit 1.5.1