summary refs log tree commit diff
path: root/synapse/config/emailconfig.py
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-11-26 18:42:27 +0000
committerGitHub <noreply@github.com>2019-11-26 18:42:27 +0000
commitce578031f4d0fe6f1eb26de4cb3d30a4175468db (patch)
treef4bb43d389e0fefbbfdc03e173cc2c0eb11d0c4e /synapse/config/emailconfig.py
parentMerge pull request #6343 from matrix-org/rav/event_auth/4 (diff)
downloadsynapse-ce578031f4d0fe6f1eb26de4cb3d30a4175468db.tar.xz
Remove assertion and provide a clear warning on startup for missing public_baseurl (#6379)
Diffstat (limited to 'synapse/config/emailconfig.py')
-rw-r--r--synapse/config/emailconfig.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py
index 43fad0bf8b..ac1724045f 100644
--- a/synapse/config/emailconfig.py
+++ b/synapse/config/emailconfig.py
@@ -146,6 +146,8 @@ class EmailConfig(Config):
                 if k not in email_config:
                     missing.append("email." + k)
 
+            # 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")