Skip to content
Permalink
Browse files

Remove redundant entries from docker config

* no_tls is now redundant (#4613)
* we don't need a dummy cert any more (#4618)
  • Loading branch information...
richvdh committed Feb 11, 2019
1 parent 5d27730 commit 91f8cd3307fee502c6bfb064f825952b05c4617b
Showing with 2 additions and 24 deletions.
  1. +1 −0 changelog.d/4619.misc
  2. +0 −17 docker/conf/dummy.tls.crt
  3. +1 −7 docker/conf/homeserver.yaml
@@ -0,0 +1 @@
Remove redundant entries from docker config

This file was deleted.

Oops, something went wrong.
@@ -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"

0 comments on commit 91f8cd3

Please sign in to comment.
You can’t perform that action at this time.