diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-05 18:44:49 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-05 18:44:49 +0000 |
| commit | 247543408070d25c6bd16bf46edb7ccbec4fe46f (patch) | |
| tree | c9e818e8ba5291156cbbbe86afd86767f9af0009 /docker/conf/homeserver.yaml | |
| parent | Filter user directory state query to a subset of state events (#4462) (diff) | |
| parent | v0.99.0 (diff) | |
| download | synapse-247543408070d25c6bd16bf46edb7ccbec4fe46f.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docker/conf/homeserver.yaml')
| -rw-r--r-- | docker/conf/homeserver.yaml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml index 529118d184..f07d5c1001 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml @@ -2,10 +2,24 @@ ## 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 %} + tls_certificate_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.crt" tls_private_key_path: "/data/{{ SYNAPSE_SERVER_NAME }}.tls.key" -no_tls: {{ "True" if SYNAPSE_NO_TLS else "False" }} -tls_fingerprints: [] + +{% if SYNAPSE_ACME %} +acme: + enabled: true + port: 8009 +{% endif %} + +{% endif %} ## Server ## |