diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-02-05 15:43:26 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-02-05 15:43:26 +0000 |
| commit | c433d4c4d2d112dcd5541b872155b7fb849e2aad (patch) | |
| tree | 32749e974e10aeebd8eb813bb00193f19a176da1 /docker/conf/homeserver.yaml | |
| parent | Convert ACME docs to md (diff) | |
| parent | Move things from README.rst to UPDATE.md (#4569) (diff) | |
| download | synapse-c433d4c4d2d112dcd5541b872155b7fb849e2aad.tar.xz | |
Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into anoa/self_signed_upgrade
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 ## |