Mercurial > gemma
diff controllers/pwreset.go @ 332:394fafeb4052
Use viper as config storage (I don't like it).
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 03 Aug 2018 15:46:05 +0200 |
parents | 34ecfd8dc11e |
children | 33b59c848771 |
line wrap: on
line diff
--- a/controllers/pwreset.go Fri Aug 03 13:52:23 2018 +0200 +++ b/controllers/pwreset.go Fri Aug 03 15:46:05 2018 +0200 @@ -85,8 +85,7 @@ ) func asServiceUser(fn func(*sql.DB) error) error { - cfg := &config.Config - db, err := auth.OpenDB(cfg.ServiceUser, cfg.ServicePassword) + db, err := auth.OpenDB(config.ServiceUser(), config.ServicePassword()) if err == nil { defer db.Close() err = fn(db) @@ -203,20 +202,19 @@ } func sendMail(email, subject, body string) error { - cfg := &config.Config m := gomail.NewMessage() - m.SetHeader("From", cfg.MailFrom) + m.SetHeader("From", config.MailFrom()) m.SetHeader("To", email) m.SetHeader("Subject", subject) m.SetBody("text/plain", body) d := gomail.Dialer{ - Host: cfg.MailHost, - Port: int(cfg.MailPort), - Username: cfg.MailUser, - Password: cfg.MailPassword, - LocalName: cfg.MailHelo, - SSL: cfg.MailPort == 465, + Host: config.MailHost(), + Port: int(config.MailPort()), + Username: config.MailUser(), + Password: config.MailPassword(), + LocalName: config.MailHelo(), + SSL: config.MailPort() == 465, } return d.DialAndSend(m)