Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix handling of SYNAPSE_NO_TLS in docker image #5005

Merged
merged 13 commits into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5005.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Convert SYNAPSE_NO_TLS Docker variable to boolean for user friendliness. Contributed by Gabriel Eckerson.
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ when ``SYNAPSE_CONFIG_PATH`` is not set.
* ``SYNAPSE_SERVER_NAME`` (mandatory), the server public hostname.
* ``SYNAPSE_REPORT_STATS``, (mandatory, ``yes`` or ``no``), enable anonymous
statistics reporting back to the Matrix project which helps us to get funding.
* ``SYNAPSE_NO_TLS``, set this variable to disable TLS in Synapse (use this if
* ``SYNAPSE_NO_TLS``, set this variable to true to disable TLS in Synapse (use this if
you run your own TLS-capable reverse proxy).
* ``SYNAPSE_ENABLE_REGISTRATION``, set this variable to enable registration on
the Synapse instance.
Expand Down
7 changes: 7 additions & 0 deletions docker/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ def generate_secrets(environ, secrets):
if not os.path.exists("/compiled"): os.mkdir("/compiled")

config_path = "/compiled/homeserver.yaml"

# Convert SYNAPSE_NO_TLS to boolean if exists
if "SYNAPSE_NO_TLS" in environ:
if str.lower(environ["SYNAPSE_NO_TLS"]) in ("true", "on", "1", "yes"):
environ["SYNAPSE_NO_TLS"] = True
else:
environ["SYNAPSE_NO_TLS"] = False
f35f0ef9d0e827dae86552d3899f78fc marked this conversation as resolved.
Show resolved Hide resolved

convert("/conf/homeserver.yaml", config_path, environ)
convert("/conf/log.config", "/compiled/log.config", environ)
Expand Down