diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-12 10:00:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 10:00:38 +0000 |
| commit | 46b8a79b3a418ad6795e903588d1f8e12f547e2c (patch) | |
| tree | 5c96d48c07e496aec8f2b6101d711214f0087efa /docker/conf/homeserver.yaml | |
| parent | Merge pull request #4613 from matrix-org/rav/deprecate_no_tls (diff) | |
| parent | Remove redundant entries from docker config (diff) | |
| download | synapse-46b8a79b3a418ad6795e903588d1f8e12f547e2c.tar.xz | |
Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacks
Remove redundant entries from docker config
Diffstat (limited to 'docker/conf/homeserver.yaml')
| -rw-r--r-- | docker/conf/homeserver.yaml | 8 |
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" |