summary refs log tree commit diff
path: root/docker/conf/homeserver.yaml
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-17 15:44:34 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-17 16:46:02 +0100
commit1519572961d22aeaacbe9fccae7788f0f9e72b1c (patch)
tree0d7556ac6c3d2c1d1ee150a2be2d0df1771fe45c /docker/conf/homeserver.yaml
parentupdate changelog (diff)
downloadsynapse-1519572961d22aeaacbe9fccae7788f0f9e72b1c.tar.xz
Ship the email templates as package_data
move the example email templates into the synapse package so that they can be
used as package data, which should mean that all of the packaging mechanisms
(pip, docker, debian, arch, etc) should now come with the example templates.

In order to grandfather in people who relied on the templates being in the old
place, check for that situation and fall back to using the defaults if the
templates directory does not exist.
Diffstat (limited to 'docker/conf/homeserver.yaml')
-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