summary refs log tree commit diff
path: root/synapse/config/tls.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-02-12 10:52:08 +0000
committerGitHub <noreply@github.com>2019-02-12 10:52:08 +0000
commita4ce91396bda0c6a6e3a2392355f8297cc97071b (patch)
tree845e78ff79f0a15960117a2308eb3f5448192e25 /synapse/config/tls.py
parentFix error when loading cert if tls is disabled (#4618) (diff)
downloadsynapse-a4ce91396bda0c6a6e3a2392355f8297cc97071b.tar.xz
Disable TLS by default (#4614)
Diffstat (limited to 'synapse/config/tls.py')
-rw-r--r--synapse/config/tls.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py

index 57f117a14d..5fb3486db1 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py
@@ -176,10 +176,10 @@ class TlsConfig(Config): # See 'ACME support' below to enable auto-provisioning this certificate via # Let's Encrypt. # - tls_certificate_path: "%(tls_certificate_path)s" + # tls_certificate_path: "%(tls_certificate_path)s" # PEM-encoded private key for TLS - tls_private_key_path: "%(tls_private_key_path)s" + # tls_private_key_path: "%(tls_private_key_path)s" # ACME support: This will configure Synapse to request a valid TLS certificate # for your configured `server_name` via Let's Encrypt. @@ -204,7 +204,7 @@ class TlsConfig(Config): # acme: # ACME support is disabled by default. Uncomment the following line - # to enable it. + # (and tls_certificate_path and tls_private_key_path above) to enable it. # # enabled: true