Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacks

Remove redundant entries from docker config
matrix-org · Feb 12, 2019 · 46b8a79 · 46b8a79
2 parents 8a2e316 + 91f8cd3
commit 46b8a79
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/changelog.d/4619.misc b/changelog.d/4619.misc
@@ -0,0 +1 @@
+Remove redundant entries from docker config
diff --git a/docker/conf/dummy.tls.crt b/docker/conf/dummy.tls.crt
diff --git 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"