diff options
author | Peter <peter@smitmail.eu> | 2014-12-18 13:34:30 +0200 |
---|---|---|
committer | Peter <peter@smitmail.eu> | 2014-12-18 13:34:30 +0200 |
commit | 87be137b881ab868df30aa7e35923d6f14606c79 (patch) | |
tree | 61d096b42ca17ad82d75a9b11634da7768d38305 /modules/setting | |
parent | 0a697517ac79ea4b5f710f83381ed13dffb00272 (diff) | |
download | gitea-87be137b881ab868df30aa7e35923d6f14606c79.tar.gz gitea-87be137b881ab868df30aa7e35923d6f14606c79.zip |
Rewrite of SendMail function
The SendMail function is rewritten and has the following new functionality:
- It is optional to skip verification of keys. The config option SKIP_VERIFY is added
- If the port is 465, or ending on 465, the TLS(/SSL) connection is started first.
Diffstat (limited to 'modules/setting')
-rw-r--r-- | modules/setting/setting.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7765a859ab..76e1ab7696 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -437,6 +437,7 @@ type Mailer struct { Host string From string User, Passwd string + SkipVerify bool } type OauthInfo struct { @@ -463,10 +464,11 @@ func newMailService() { } MailService = &Mailer{ - Name: Cfg.MustValue("mailer", "NAME", AppName), - Host: Cfg.MustValue("mailer", "HOST"), - User: Cfg.MustValue("mailer", "USER"), - Passwd: Cfg.MustValue("mailer", "PASSWD"), + Name: Cfg.MustValue("mailer", "NAME", AppName), + Host: Cfg.MustValue("mailer", "HOST"), + User: Cfg.MustValue("mailer", "USER"), + Passwd: Cfg.MustValue("mailer", "PASSWD"), + SkipVerify: Cfg.MustBool("mailer", "SKIP_VERIFY", false), } MailService.From = Cfg.MustValue("mailer", "FROM", MailService.User) log.Info("Mail Service Enabled") |