diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-05 18:44:49 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-05 18:44:49 +0000 |
| commit | 247543408070d25c6bd16bf46edb7ccbec4fe46f (patch) | |
| tree | c9e818e8ba5291156cbbbe86afd86767f9af0009 /synapse | |
| parent | Filter user directory state query to a subset of state events (#4462) (diff) | |
| parent | v0.99.0 (diff) | |
| download | synapse-247543408070d25c6bd16bf46edb7ccbec4fe46f.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/config/tls.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index e5f680bb31..048d6e572f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.99.0rc3" +__version__ = "0.99.0" diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 5f63676d9c..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']) @@ -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 |