summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-05-05 15:54:29 +0100
committerMatthew Hodgson <matthew@matrix.org>2016-05-05 15:54:29 +0100
commit81c2176cbadf7646fc075ca45dea4360ce7b8258 (patch)
tree1452fc8abf3940b3da717e0ef82cad8a8ecfa399 /synapse/config
parentfix app branding (diff)
downloadsynapse-81c2176cbadf7646fc075ca45dea4360ce7b8258.tar.xz
fix layout; handle app naming in synapse, not jinja
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/emailconfig.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py
index 7a38680435..d6f4f83a14 100644
--- a/synapse/config/emailconfig.py
+++ b/synapse/config/emailconfig.py
@@ -65,6 +65,10 @@ class EmailConfig(Config):
             self.email_template_dir = email_config["template_dir"]
             self.email_notif_template_html = email_config["notif_template_html"]
             self.email_notif_template_text = email_config["notif_template_text"]
+            if "app_name" in email_config:
+                self.email_app_name = email_config["app_name"]
+            else:
+                self.email_app_name = "Matrix"
 
             # make sure it's valid
             parsed = email.utils.parseaddr(self.email_notif_from)
@@ -83,6 +87,7 @@ class EmailConfig(Config):
         #   smtp_host: "localhost"
         #   smtp_port: 25
         #   notif_from: Your Friendly Matrix Home Server <noreply@example.com>
+        #   app_name: Matrix
         #   template_dir: res/templates
         #   notif_template_html: notif_mail.html
         #   notif_template_text: notif_mail.txt