diff options
| author | Ben Banfield-Zanin <benbz@matrix.org> | 2021-01-29 09:28:14 +0000 |
|---|---|---|
| committer | Ben Banfield-Zanin <benbz@matrix.org> | 2021-01-29 09:28:14 +0000 |
| commit | bf2a7dcd3143a7a8acff94b839710f1e3df1fa30 (patch) | |
| tree | da713975cbe121c5327656d5d3814fcc56916a7a /synapse/config/emailconfig.py | |
| parent | Merge remote-tracking branch 'origin/release-v1.25.0' into toml/keycloak_hints (diff) | |
| parent | Update debian changelog. (diff) | |
| download | synapse-bf2a7dcd3143a7a8acff94b839710f1e3df1fa30.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.26.0' into toml/keycloak_hints
Diffstat (limited to 'synapse/config/emailconfig.py')
| -rw-r--r-- | synapse/config/emailconfig.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index d4328c46b9..6a487afd34 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -166,11 +166,6 @@ 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),) @@ -269,9 +264,6 @@ 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" |