summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-17 17:34:22 +0100
committerGitHub <noreply@github.com>2018-10-17 17:34:22 +0100
commitf1bfe6167a5640caaf2f85a96b87e327132f3906 (patch)
tree1c1620912f5bdec15bd4f1cc43fe47a66a231b72 /docker/conf
parentupdate changelog (diff)
parentPut the warning blob at the top of the file (diff)
downloadsynapse-f1bfe6167a5640caaf2f85a96b87e327132f3906.tar.xz
Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data
Ship the email templates as package_data
Diffstat (limited to 'docker/conf')
-rw-r--r--docker/conf/homeserver.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
index cfe88788f2..a38b929f50 100644
--- a/docker/conf/homeserver.yaml
+++ b/docker/conf/homeserver.yaml
@@ -211,7 +211,9 @@ email:
    require_transport_security: False
    notif_from: "{{ SYNAPSE_SMTP_FROM or "hostmaster@" + SYNAPSE_SERVER_NAME }}"
    app_name: Matrix
-   template_dir: res/templates
+   # 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