Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5077 from matrix-org/babolivier/account_expiration 

Don't crash on lack of expiry templates
This commit is contained in:
Brendan Abolivier 2019-04-18 15:10:06 +01:00 committed by GitHub
parent f30a882cc6 f8826d31cd
commit 1a63c7c281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5077.bugfix Normal file
View File

@ -0,0 +1 @@
Don't crash on lack of expiry templates.

8
synapse/config/emailconfig.py
View File

@ -71,8 +71,12 @@ class EmailConfig(Config):
self.email_notif_from = email_config["notif_from"] self.email_notif_from = email_config["notif_from"]
self.email_notif_template_html = email_config["notif_template_html"] self.email_notif_template_html = email_config["notif_template_html"]
self.email_notif_template_text = email_config["notif_template_text"] self.email_notif_template_text = email_config["notif_template_text"]
self.email_expiry_template_html = email_config["expiry_template_html"] self.email_expiry_template_html = email_config.get(
self.email_expiry_template_text = email_config["expiry_template_text"] "expiry_template_html", "notice_expiry.html",
)
self.email_expiry_template_text = email_config.get(
"expiry_template_text", "notice_expiry.txt",
)
template_dir = email_config.get("template_dir") template_dir = email_config.get("template_dir")
# we need an absolute path, because we change directory after starting (and # we need an absolute path, because we change directory after starting (and