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-18 15:07:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-18 15:07:03 +0100
commitc632bc865448b40d246878e2d6c9287621b4ba0e (patch)
treed126c9cba47f70f40cee6acebac8f1cf93599e66 /docker/conf/homeserver.yaml
parentMerge pull request #4049 from matrix-org/erikj/synctl_colour (diff)
parent0.33.7 (diff)
downloadsynapse-c632bc865448b40d246878e2d6c9287621b4ba0e.tar.xz
Merge branch 'master' into develop
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