conf: overhaul auth and user settings (#5942)

* conf: overhaul auth and user settings

* ci: update travis Go versions

1 files changed, 5 insertions, 5 deletions

diff --git a/internal/route/install.go b/internal/route/install.go
index 16054e83..c9d13d98 100644
--- a/internal/route/install.go
+++ b/internal/route/install.go
@@ -180,16 +180,16 @@ func Install(c *context.Context) {
 		f.SMTPFrom = conf.Email.From
 		f.SMTPUser = conf.Email.User
 	}
-	f.RegisterConfirm = conf.Service.RegisterEmailConfirm
-	f.MailNotify = conf.Service.EnableNotifyMail
+	f.RegisterConfirm = conf.Auth.RequireEmailConfirmation
+	f.MailNotify = conf.User.EnableEmailNotification
 
 	// Server and other services settings
 	f.OfflineMode = conf.Server.OfflineMode
 	f.DisableGravatar = conf.DisableGravatar
 	f.EnableFederatedAvatar = conf.EnableFederatedAvatar
-	f.DisableRegistration = conf.Service.DisableRegistration
-	f.EnableCaptcha = conf.Service.EnableCaptcha
-	f.RequireSignInView = conf.Service.RequireSignInView
+	f.DisableRegistration = conf.Auth.DisableRegistration
+	f.EnableCaptcha = conf.Auth.EnableRegistrationCaptcha
+	f.RequireSignInView = conf.Auth.RequireSigninView
 
 	form.Assign(f, c.Data)
 	c.Success(INSTALL)