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

Commit c7b48bd

Browse files
anoadragon453richvdh
authored andcommitted
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 #5430
1 parent 0ee9076 commit c7b48bd

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

changelog.d/5596.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed the `SYNAPSE_SMTP_*` docker container environment variables. Using these environment variables prevented the docker container from starting in Synapse v1.0, even though they didn't actually allow any functionality anyway. Users are advised to remove `SYNAPSE_SMTP_HOST`, `SYNAPSE_SMTP_PORT`, `SYNAPSE_SMTP_USER`, `SYNAPSE_SMTP_PASSWORD` and `SYNAPSE_SMTP_FROM` environment variables from their docker run commands.

docker/conf/homeserver.yaml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -207,22 +207,3 @@ perspectives:
207207

208208
password_config:
209209
enabled: true
210-
211-
{% if SYNAPSE_SMTP_HOST %}
212-
email:
213-
enable_notifs: false
214-
smtp_host: "{{ SYNAPSE_SMTP_HOST }}"
215-
smtp_port: {{ SYNAPSE_SMTP_PORT or "25" }}
216-
smtp_user: "{{ SYNAPSE_SMTP_USER }}"
217-
smtp_pass: "{{ SYNAPSE_SMTP_PASSWORD }}"
218-
require_transport_security: False
219-
notif_from: "{{ SYNAPSE_SMTP_FROM or "hostmaster@" + SYNAPSE_SERVER_NAME }}"
220-
app_name: Matrix
221-
# if template_dir is unset, uses the example templates that are part of
222-
# the Synapse distribution.
223-
#template_dir: res/templates
224-
notif_template_html: notif_mail.html
225-
notif_template_text: notif_mail.txt
226-
notif_for_new_users: True
227-
riot_base_url: "https://{{ SYNAPSE_SERVER_NAME }}"
228-
{% endif %}

0 commit comments

Comments
 (0)