summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorBrendan Abolivier <contact@brendanabolivier.com>2019-02-19 11:15:38 +0000
committerGitHub <noreply@github.com>2019-02-19 11:15:38 +0000
commita288bdf0b139dd2adbcf2145bf98a11d448ea96c (patch)
tree3d2356836c3a1f04f0e556f55886404ab5d5c7d2 /synapse/handlers
parentMerge pull request #4670 from matrix-org/erikj/register_login_split (diff)
parentImprove config documentation (diff)
downloadsynapse-a288bdf0b139dd2adbcf2145bf98a11d448ea96c.tar.xz
Merge pull request #4652 from matrix-org/babolivier/acme-delegated
Support .well-known delegation when issuing certificates through ACME
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/acme.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/handlers/acme.py b/synapse/handlers/acme.py

index dd0b217965..813777bf18 100644 --- a/synapse/handlers/acme.py +++ b/synapse/handlers/acme.py
@@ -56,6 +56,7 @@ class AcmeHandler(object): def __init__(self, hs): self.hs = hs self.reactor = hs.get_reactor() + self._acme_domain = hs.config.acme_domain @defer.inlineCallbacks def start_listening(self): @@ -123,15 +124,15 @@ class AcmeHandler(object): @defer.inlineCallbacks def provision_certificate(self): - logger.warning("Reprovisioning %s", self.hs.hostname) + logger.warning("Reprovisioning %s", self._acme_domain) try: - yield self._issuer.issue_cert(self.hs.hostname) + yield self._issuer.issue_cert(self._acme_domain) except Exception: logger.exception("Fail!") raise - logger.warning("Reprovisioned %s, saving.", self.hs.hostname) - cert_chain = self._store.certs[self.hs.hostname] + logger.warning("Reprovisioned %s, saving.", self._acme_domain) + cert_chain = self._store.certs[self._acme_domain] try: with open(self.hs.config.tls_private_key_file, "wb") as private_key_file: