summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-07-03 07:14:48 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-07-03 07:14:48 +0100
commitc7b48bd42deb4b8c320c6c1b4006e689a9eefe14 (patch)
treed296afdf50a03e2aeef012618cd0dad27c5859ec /docker/conf
parentFix media repo breaking (#5593) (diff)
downloadsynapse-c7b48bd42deb4b8c320c6c1b4006e689a9eefe14.tar.xz
Remove SMTP_* env var functionality from docker conf (#5596)
Removes any `SMTP_*` docker container environment variables from having any effect on the default config.

Fixes https://github.com/matrix-org/synapse/issues/5430
Diffstat (limited to '')
-rw-r--r--docker/conf/homeserver.yaml19
1 files changed, 0 insertions, 19 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml

index b0267b1c60..c1110f0f53 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml
@@ -207,22 +207,3 @@ perspectives: password_config: enabled: true - -{% if SYNAPSE_SMTP_HOST %} -email: - enable_notifs: false - smtp_host: "{{ SYNAPSE_SMTP_HOST }}" - smtp_port: {{ SYNAPSE_SMTP_PORT or "25" }} - smtp_user: "{{ SYNAPSE_SMTP_USER }}" - smtp_pass: "{{ SYNAPSE_SMTP_PASSWORD }}" - require_transport_security: False - notif_from: "{{ SYNAPSE_SMTP_FROM or "hostmaster@" + SYNAPSE_SERVER_NAME }}" - app_name: Matrix - # if template_dir is unset, uses the example templates that are part of - # the Synapse distribution. - #template_dir: res/templates - notif_template_html: notif_mail.html - notif_template_text: notif_mail.txt - notif_for_new_users: True - riot_base_url: "https://{{ SYNAPSE_SERVER_NAME }}" -{% endif %}