diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-02-25 00:35:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 00:35:35 +0800 |
| commit | 52ffb67b33c1823933948c027b6f3605fb42ea7c (patch) | |
| tree | c93ee7eb2bb1f8417d350f703afc53cf4dd872f8 /internal/route/install.go | |
| parent | 0d6c405ccbde9d20889893168f9f9599118e3f5c (diff) | |
conf: overhaul email settings (#5940)
Diffstat (limited to 'internal/route/install.go')
| -rw-r--r-- | internal/route/install.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/internal/route/install.go b/internal/route/install.go index 707c788d..16054e83 100644 --- a/internal/route/install.go +++ b/internal/route/install.go @@ -24,8 +24,8 @@ import ( "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/cron" "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" - "gogs.io/gogs/internal/mailer" "gogs.io/gogs/internal/markup" "gogs.io/gogs/internal/osutil" "gogs.io/gogs/internal/ssh" @@ -63,8 +63,12 @@ func GlobalInit(customConf string) error { log.Trace("Build time: %s", conf.BuildTime) log.Trace("Build commit: %s", conf.BuildCommit) + if conf.Email.Enabled { + log.Trace("Email service is enabled") + } + conf.NewServices() - mailer.NewContext() + email.NewContext() if conf.Security.InstallLock { highlight.NewContext() @@ -171,10 +175,10 @@ func Install(c *context.Context) { f.LogRootPath = conf.LogRootPath // E-mail service settings - if conf.MailService != nil { - f.SMTPHost = conf.MailService.Host - f.SMTPFrom = conf.MailService.From - f.SMTPUser = conf.MailService.User + if conf.Email.Enabled { + f.SMTPHost = conf.Email.Host + f.SMTPFrom = conf.Email.From + f.SMTPUser = conf.Email.User } f.RegisterConfirm = conf.Service.RegisterEmailConfirm f.MailNotify = conf.Service.EnableNotifyMail |