diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-09-16 12:36:39 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-09-16 12:36:39 +0100 |
| commit | cc83b06cd19f8fc52f86700c1663185a2b1a7cac (patch) | |
| tree | 9f6d8c2dcae8057e52a3870ea2ada8be728a43b5 /synapse/config/homeserver.py | |
| parent | Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to... (diff) | |
| download | synapse-cc83b06cd19f8fc52f86700c1663185a2b1a7cac.tar.xz | |
Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index e16f2c733b..4b810a2302 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -20,11 +20,15 @@ from .database import DatabaseConfig from .ratelimiting import RatelimitConfig from .repository import ContentRepositoryConfig from .captcha import CaptchaConfig +from .email import EmailConfig + class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, - RatelimitConfig, ContentRepositoryConfig, CaptchaConfig): + RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, + EmailConfig): pass -if __name__=='__main__': + +if __name__ == '__main__': import sys HomeServerConfig.load_config("Generate config", sys.argv[1:], "HomeServer") |