diff options
| author | Brendan Abolivier <contact@brendanabolivier.com> | 2019-04-18 15:10:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 15:10:06 +0100 |
| commit | 1a63c7c281473e803bc35a108b2936daa392e399 (patch) | |
| tree | bbec6cf291f8776dc94a51abbe8aa1495fd89b13 | |
| parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
| parent | Don't crash on lack of expiry templates (diff) | |
| download | synapse-1a63c7c281473e803bc35a108b2936daa392e399.tar.xz | |
Merge pull request #5077 from matrix-org/babolivier/account_expiration
Don't crash on lack of expiry templates
| -rw-r--r-- | changelog.d/5077.bugfix | 1 | ||||
| -rw-r--r-- | synapse/config/emailconfig.py | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelog.d/5077.bugfix b/changelog.d/5077.bugfix new file mode 100644 index 0000000000..f3345a6353 --- /dev/null +++ b/changelog.d/5077.bugfix @@ -0,0 +1 @@ +Don't crash on lack of expiry templates. diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index 60827be72f..342a6ce5fd 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -71,8 +71,12 @@ class EmailConfig(Config): self.email_notif_from = email_config["notif_from"] self.email_notif_template_html = email_config["notif_template_html"] self.email_notif_template_text = email_config["notif_template_text"] - self.email_expiry_template_html = email_config["expiry_template_html"] - self.email_expiry_template_text = email_config["expiry_template_text"] + self.email_expiry_template_html = email_config.get( + "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") # we need an absolute path, because we change directory after starting (and |