diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:30:16 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:30:16 -0500 |
| commit | fa0f99e4f2ff3fdedf03f700b2c11004166f991f (patch) | |
| tree | 8ae535542771484573b944785ec132b80b2a9cd5 /synapse/config/emailconfig.py | |
| parent | Revert "block groups requests to fosdem" (diff) | |
| parent | Clarify when new ratelimiting was added. (diff) | |
| download | synapse-fa0f99e4f2ff3fdedf03f700b2c11004166f991f.tar.xz | |
Merge branch 'release-v1.27.0' into matrix-org-hotfixes
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" |