Browse Source

minor: nginx实例初始值

tuon 1 year ago
parent
commit
2fb8b45c9a
2 changed files with 8 additions and 1 deletions
  1. 2 1
      server/config/config.go
  2. 6 0
      server/controllers/nginx.go

+ 2 - 1
server/config/config.go

@@ -114,7 +114,8 @@ func InitAdmin() {
 	reset := beego.AppConfig.DefaultBool("reset_admin_password", false)
 	admin := models.User{Account: "admin"}
 	err := o.Read(&admin, "Account")
-	if err == nil && !reset {
+	if admin.Id > 0 && !reset {
+		logs.Info("admin has exist and reset is false, skip")
 		return
 	}
 	password := beego.AppConfig.DefaultString("admin_password", randPassword(10))

+ 6 - 0
server/controllers/nginx.go

@@ -59,6 +59,12 @@ func (c *NginxController) Post() {
 	o := orm.NewOrm()
 
 	nginx.Uid = current.Account
+	nginx.NginxPath = "/usr/sbin/nginx"
+	nginx.NginxDir = "/etc/nginx"
+	if nginx.IsLocal {
+		nginx.IsServer = true
+	}
+	nginx.DataDir = "/app/data"
 	_, err = o.Insert(&nginx)
 
 	if err != nil {