diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-02-25 19:16:33 +0000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-02-25 11:16:33 -0800 |
| commit | 641c409e4e979c962d049b2b01404e4f3f2f75aa (patch) | |
| tree | 62544e0a205b34013f314f04413e1f43720d5178 | |
| parent | switch from google.com to recaptcha.net for reCAPTCHA (#4731) (diff) | |
| download | synapse-641c409e4e979c962d049b2b01404e4f3f2f75aa.tar.xz | |
Fix ACME config for python 2. (#4717)
Fixes #4675.
| -rw-r--r-- | changelog.d/4717.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/tls.py | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changelog.d/4717.bugfix b/changelog.d/4717.bugfix new file mode 100644 index 0000000000..79ab231477 --- /dev/null +++ b/changelog.d/4717.bugfix @@ -0,0 +1 @@ +Fix ACME config for python 2. diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 8d5d287357..40045de7ac 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -19,6 +19,8 @@ import warnings from datetime import datetime from hashlib import sha256 +import six + from unpaddedbase64 import encode_base64 from OpenSSL import crypto @@ -36,9 +38,11 @@ class TlsConfig(Config): acme_config = {} self.acme_enabled = acme_config.get("enabled", False) - self.acme_url = acme_config.get( + + # hyperlink complains on py2 if this is not a Unicode + self.acme_url = six.text_type(acme_config.get( "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']) self.acme_reprovision_threshold = acme_config.get("reprovision_threshold", 30) @@ -55,7 +59,7 @@ class TlsConfig(Config): ) if not self.tls_private_key_file: raise ConfigError( - "tls_certificate_path must be specified if TLS-enabled listeners are " + "tls_private_key_path must be specified if TLS-enabled listeners are " "configured." ) |