kaslo/synapse
1
0
Fork 0
Code Wiki Activity

test for ci

Browse Source
This commit is contained in:
Andrew Morgan
2019-06-06 14:23:43 +01:00
parent a37a2f13cf
commit cd4f4a2ab4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/config/emailconfig.py
View File

@@ -85,7 +85,7 @@ class EmailConfig(Config):
self.email_password_reset_behaviour = (
"remote" if email_trust_identity_server_for_password_resets else "local"
)
if not email_trust_identity_server_for_password_resets and email_config == {}:
if self.email_password_reset_behaviour == "local" and email_config == {}:
logger.warn(
"User password resets have been disabled due to lack of email config"
)
@@ -123,8 +123,8 @@ class EmailConfig(Config):
if (len(missing) > 0):
raise RuntimeError(
"email.password_reset_behaviour is set to 'local' "
"but required keys are missing: %s" %
(", ".join(["email." + k for k in missing]),)
"but required keys are missing: %s email config: %s" %
(", ".join(["email." + k for k in missing]), email_config)
)
# Templates for password reset emails