diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-02-11 11:16:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 11:16:54 -0500 |
| commit | e40d88cff3cca3d5186d5f623ad1107bc403d69b (patch) | |
| tree | 1bb8e1daa3f43099f535eb56dacd472edb78795e /synapse/config/emailconfig.py | |
| parent | Clarify documentation about escaping URLs in templates. (#9310) (diff) | |
| download | synapse-e40d88cff3cca3d5186d5f623ad1107bc403d69b.tar.xz | |
Backout changes for automatically calculating the public baseurl. (#9313)
This breaks some people's configurations (if their Client-Server API is not accessed via port 443).
Diffstat (limited to 'synapse/config/emailconfig.py')
| -rw-r--r-- | synapse/config/emailconfig.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index 6a487afd34..d4328c46b9 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -166,6 +166,11 @@ class EmailConfig(Config): if not self.email_notif_from: missing.append("email.notif_from") + # public_baseurl is required to build password reset and validation links that + # will be emailed to users + if config.get("public_baseurl") is None: + missing.append("public_baseurl") + if missing: raise ConfigError( MISSING_PASSWORD_RESET_CONFIG_ERROR % (", ".join(missing),) @@ -264,6 +269,9 @@ class EmailConfig(Config): if not self.email_notif_from: missing.append("email.notif_from") + if config.get("public_baseurl") is None: + missing.append("public_baseurl") + if missing: raise ConfigError( "email.enable_notifs is True but required keys are missing: %s" |