diff options
Diffstat (limited to 'routers/install.go')
| -rw-r--r-- | routers/install.go | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/routers/install.go b/routers/install.go index bb3c16ea..3ac35f35 100644 --- a/routers/install.go +++ b/routers/install.go @@ -11,8 +11,9 @@ import ( "path" "strings" + "github.com/Unknwon/com" "github.com/Unknwon/goconfig" - "github.com/go-martini/martini" + "github.com/Unknwon/macaron" "github.com/go-xorm/xorm" "github.com/gogits/gogs/models" @@ -33,12 +34,12 @@ const ( func checkRunMode() { switch setting.Cfg.MustValue("", "RUN_MODE") { case "prod": - martini.Env = martini.Prod + macaron.Env = macaron.PROD setting.ProdMode = true case "test": - martini.Env = martini.Test + macaron.Env = macaron.TEST } - log.Info("Run Mode: %s", strings.Title(martini.Env)) + log.Info("Run Mode: %s", strings.Title(macaron.Env)) } func NewServices() { @@ -53,13 +54,14 @@ func GlobalInit() { log.Trace("Log path: %s", setting.LogRootPath) mailer.NewMailerContext() models.LoadModelsConfig() - models.LoadRepoConfig() - models.NewRepoContext() NewServices() if setting.InstallLock { + models.LoadRepoConfig() + models.NewRepoContext() + if err := models.NewEngine(); err != nil { - log.Fatal("Fail to initialize ORM engine: %v", err) + log.Fatal(4, "Fail to initialize ORM engine: %v", err) } models.HasEngine = true @@ -210,12 +212,14 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { setting.Cfg.SetValue("mailer", "USER", form.SmtpEmail) setting.Cfg.SetValue("mailer", "PASSWD", form.SmtpPasswd) - setting.Cfg.SetValue("service", "REGISTER_EMAIL_CONFIRM", base.ToStr(form.RegisterConfirm == "on")) - setting.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", base.ToStr(form.MailNotify == "on")) + setting.Cfg.SetValue("service", "REGISTER_EMAIL_CONFIRM", com.ToStr(form.RegisterConfirm == "on")) + setting.Cfg.SetValue("service", "ENABLE_NOTIFY_MAIL", com.ToStr(form.MailNotify == "on")) } setting.Cfg.SetValue("", "RUN_MODE", "prod") + setting.Cfg.SetValue("log", "MODE", "file") + setting.Cfg.SetValue("security", "INSTALL_LOCK", "true") os.MkdirAll("custom/conf", os.ModePerm) @@ -227,7 +231,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { GlobalInit() // Create admin account. - if _, err := models.CreateUser(&models.User{Name: form.AdminName, Email: form.AdminEmail, Passwd: form.AdminPasswd, + if err := models.CreateUser(&models.User{Name: form.AdminName, Email: form.AdminEmail, Passwd: form.AdminPasswd, IsAdmin: true, IsActive: true}); err != nil { if err != models.ErrUserAlreadyExist { setting.InstallLock = false |