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

Various cosmetics to make TravisCI happy

pull/4652/head
Brendan Abolivier 2019-02-15 12:29:34 +00:00
parent af8a2f679b
commit f86b695cbd
No known key found for this signature in database
GPG Key ID: 8EF1500759F70623
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/acme.py
View File

@ -131,13 +131,16 @@ class AcmeHandler(object):
tls_client_options_factory=ClientTLSOptionsFactory(None), tls_client_options_factory=ClientTLSOptionsFactory(None),
reactor=self.reactor, reactor=self.reactor,
) )
delegated = yield agent._get_well_known(bytes(self.hs.hostname,"ascii")) delegated = yield agent._get_well_known(bytes(self.hs.hostname, "ascii"))
# If .well-known is in use, use the delegated hostname instead of the # If .well-known is in use, use the delegated hostname instead of the
# homeserver's server_name. # homeserver's server_name.
if delegated: if delegated:
cert_name = delegated.decode("ascii") cert_name = delegated.decode("ascii")
logger.info(".well-known is in use, provisionning %s instead of %s", cert_name, self.hs.hostname) logger.info(
".well-known is in use, provisionning %s instead of %s",
cert_name, self.hs.hostname,
)
else: else:
cert_name = self.hs.hostname cert_name = self.hs.hostname