summary refs log tree commit diff
path: root/docker/conf/homeserver.yaml
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-11 22:15:08 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-11 22:16:44 +0000
commit91f8cd3307fee502c6bfb064f825952b05c4617b (patch)
tree0e83f1a28db24af14f2faa48ca8a54b5b8ebdb3a /docker/conf/homeserver.yaml
parentMove ClientTLSOptionsFactory init out of refresh_certificates (#4611) (diff)
downloadsynapse-91f8cd3307fee502c6bfb064f825952b05c4617b.tar.xz
Remove redundant entries from docker config
* no_tls is now redundant (#4613)
* we don't need a dummy cert any more (#4618)
Diffstat (limited to 'docker/conf/homeserver.yaml')
-rw-r--r--docker/conf/homeserver.yaml8
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
index f07d5c1001..babd5bef9e 100644
--- a/docker/conf/homeserver.yaml
+++ b/docker/conf/homeserver.yaml
@@ -2,13 +2,7 @@
 
 ## TLS ##
 
-{% if SYNAPSE_NO_TLS %}
-no_tls: True
-
-# workaround for https://github.com/matrix-org/synapse/issues/4554
-tls_certificate_path: "/conf/dummy.tls.crt"
-
-{% else %}
+{% if not SYNAPSE_NO_TLS %}
 
 tls_certificate_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.crt"
 tls_private_key_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.key"