diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
| commit | 3accee1a8c2804620713ac4ff068a4a18a7de192 (patch) | |
| tree | 5bfad3c1e8653713f8e14062732f892797279a92 /synapse/push/mailer.py | |
| parent | Merge pull request #2136 from bbigras/patch-1 (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-3accee1a8c2804620713ac4ff068a4a18a7de192.tar.xz | |
Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse v0.21.0
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 3a50c72e0b..f83aa7625c 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -200,7 +200,11 @@ class Mailer(object): yield sendmail( self.hs.config.email_smtp_host, raw_from, raw_to, multipart_msg.as_string(), - port=self.hs.config.email_smtp_port + port=self.hs.config.email_smtp_port, + requireAuthentication=self.hs.config.email_smtp_user is not None, + username=self.hs.config.email_smtp_user, + password=self.hs.config.email_smtp_pass, + requireTransportSecurity=self.hs.config.require_transport_security ) @defer.inlineCallbacks |