summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-16 12:36:39 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-16 12:36:39 +0100
commitcc83b06cd19f8fc52f86700c1663185a2b1a7cac (patch)
tree9f6d8c2dcae8057e52a3870ea2ada8be728a43b5 /synapse/config
parentAdded PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to... (diff)
downloadsynapse-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')
-rw-r--r--synapse/config/email.py39
-rw-r--r--synapse/config/homeserver.py8
2 files changed, 45 insertions, 2 deletions
diff --git a/synapse/config/email.py b/synapse/config/email.py
new file mode 100644

index 0000000000..9bcc5a8fea --- /dev/null +++ b/synapse/config/email.py
@@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Copyright 2014 OpenMarket Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from ._base import Config + + +class EmailConfig(Config): + + def __init__(self, args): + super(EmailConfig, self).__init__(args) + self.email_from_address = args.email_from_address + self.email_smtp_server = args.email_smtp_server + + @classmethod + def add_arguments(cls, parser): + super(EmailConfig, cls).add_arguments(parser) + email_group = parser.add_argument_group("email") + email_group.add_argument( + "--email-from-address", + default="FROM@EXAMPLE.COM", + help="The address to send emails from (e.g. for password resets)." + ) + email_group.add_argument( + "--email-smtp-server", + default="", + help="The SMTP server to send emails from (e.g. for password resets)." + ) \ No newline at end of file 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")