feat: added custom nginx reload/restart cmd #140

Author: 0xJacky

app.example.ini

@@ -8,12 +8,14 @@ StartCmd = login
 Database = database
 CADir =
 Demo =
-GithubProxy =
-NginxConfigDir =
 
-[nginx_log]
+[nginx]
 AccessLogPath = /var/log/nginx/access.log
-ErrorLogPath = /var/log/nginx/error.log
+ErrorLogPath  = /var/log/nginx/error.log
+ConfigDir    =
+PIDPath       =
+ReloadCmd     =
+RestartCmd    =
 
 [openai]
 Model =

go.mod

@@ -175,7 +175,6 @@ require (
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sync v0.2.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect

go.sum

@@ -141,20 +141,20 @@ func getLogPath(control *controlStruct) (logPath string, err error) {
 		logPath = directive.Params
 
 	case "error":
-		if settings.NginxLogSettings.ErrorLogPath == "" {
+		if settings.NginxSettings.ErrorLogPath == "" {
 			err = errors.New("settings.NginxLogSettings.ErrorLogPath is empty," +
 				" see https://github.com/0xJacky/nginx-ui/wiki/Nginx-Log-Configuration for more information")
 			return
 		}
-		logPath = settings.NginxLogSettings.ErrorLogPath
+		logPath = settings.NginxSettings.ErrorLogPath
 
 	default:
-		if settings.NginxLogSettings.AccessLogPath == "" {
+		if settings.NginxSettings.AccessLogPath == "" {
 			err = errors.New("settings.NginxLogSettings.AccessLogPath is empty," +
 				" see https://github.com/0xJacky/nginx-ui/wiki/Nginx-Log-Configuration for more information")
 			return
 		}
-		logPath = settings.NginxLogSettings.AccessLogPath
+		logPath = settings.NginxSettings.AccessLogPath
 	}
 
 	return

server/api/nginx_log.go

@@ -8,26 +8,26 @@ import (
 
 func GetSettings(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{
-		"server":    settings.ServerSettings,
-		"nginx_log": settings.NginxLogSettings,
-		"openai":    settings.OpenAISettings,
-		"git":       settings.GitSettings,
+		"server": settings.ServerSettings,
+		"nginx":  settings.NginxSettings,
+		"openai": settings.OpenAISettings,
+		"git":    settings.GitSettings,
 	})
 }
 
 func SaveSettings(c *gin.Context) {
 	var json struct {
-		Server   settings.Server   `json:"server"`
-		NginxLog settings.NginxLog `json:"nginx_log"`
-		Openai   settings.OpenAI   `json:"openai"`
+		Server settings.Server `json:"server"`
+		Nginx  settings.Nginx  `json:"nginx"`
+		Openai settings.OpenAI `json:"openai"`
 	}
 
 	if !BindAndValid(c, &json) {
 		return
 	}
 
 	settings.ServerSettings = &json.Server
-	settings.NginxLogSettings = &json.NginxLog
+	settings.NginxSettings = &json.Nginx
 	settings.OpenAISettings = &json.Openai
 
 	settings.ReflectFrom()

server/api/settings.go

@@ -8,6 +8,12 @@ import (
 	"regexp"
 )
 
+func execShell(cmd string) (out string, err error) {
+	bytes, err := exec.Command("/bin/sh", "-c", cmd).CombinedOutput()
+	out = string(bytes)
+	return
+}
+
 func TestConf() string {
 	out, err := exec.Command("nginx", "-t").CombinedOutput()
 	if err != nil {
@@ -18,29 +24,53 @@ func TestConf() string {
 }
 
 func Reload() string {
-	out, err := exec.Command("nginx", "-s", "reload").CombinedOutput()
+	if settings.NginxSettings.ReloadCmd != "" {
+		out, err := execShell(settings.NginxSettings.ReloadCmd)
 
-	if err != nil {
-		logger.Error(err)
+		if err != nil {
+			logger.Error(err)
+		}
+
+		return out
+
+	} else {
+		out, err := exec.Command("nginx", "-s", "reload").CombinedOutput()
+
+		if err != nil {
+			logger.Error(err)
+		}
+
+		return string(out)
 	}
 
-	return string(out)
 }
 
 func Restart() string {
-	out, err := exec.Command("nginx", "-s", "reopen").CombinedOutput()
+	if settings.NginxSettings.RestartCmd != "" {
+		out, err := execShell(settings.NginxSettings.RestartCmd)
 
-	if err != nil {
-		logger.Error(err)
+		if err != nil {
+			logger.Error(err)
+		}
+
+		return out
+	} else {
+
+		out, err := exec.Command("nginx", "-s", "reopen").CombinedOutput()
+
+		if err != nil {
+			logger.Error(err)
+		}
+
+		return string(out)
 	}
 
-	return string(out)
 }
 
 func GetConfPath(dir ...string) string {
 	var confPath string
 
-	if settings.ServerSettings.NginxConfigDir == "" {
+	if settings.NginxSettings.ConfigDir == "" {
 		out, err := exec.Command("nginx", "-V").CombinedOutput()
 		if err != nil {
 			logger.Error(err)
@@ -54,7 +84,7 @@ func GetConfPath(dir ...string) string {
 		}
 		confPath = r.FindStringSubmatch(string(out))[1]
 	} else {
-		confPath = settings.ServerSettings.NginxConfigDir
+		confPath = settings.NginxSettings.ConfigDir
 	}
 
 	return filepath.Join(confPath, filepath.Join(dir...))
@@ -63,7 +93,7 @@ func GetConfPath(dir ...string) string {
 func GetNginxPIDPath() string {
 	var confPath string
 
-	if settings.ServerSettings.NginxPIDPath == "" {
+	if settings.NginxSettings.PIDPath == "" {
 		out, err := exec.Command("nginx", "-V").CombinedOutput()
 		if err != nil {
 			logger.Error(err)
@@ -77,7 +107,7 @@ func GetNginxPIDPath() string {
 		}
 		confPath = r.FindStringSubmatch(string(out))[1]
 	} else {
-		confPath = settings.ServerSettings.NginxPIDPath
+		confPath = settings.NginxSettings.PIDPath
 	}
 
 	return confPath

server/internal/nginx/nginx.go

@@ -28,13 +28,15 @@ type Server struct {
 	Demo              bool   `json:"demo"`
 	PageSize          int    `json:"page_size"`
 	GithubProxy       string `json:"github_proxy"`
-	NginxConfigDir    string `json:"nginx_config_dir"`
-	NginxPIDPath      string `json:"nginx_pid_path"`
 }
 
-type NginxLog struct {
+type Nginx struct {
 	AccessLogPath string `json:"access_log_path"`
 	ErrorLogPath  string `json:"error_log_path"`
+	ConfigDir     string `json:"nginx_config_dir"`
+	PIDPath       string `json:"nginx_pid_path"`
+	ReloadCmd     string `json:"reload_cmd"`
+	RestartCmd    string `json:"restart_cmd"`
 }
 
 type OpenAI struct {
@@ -64,7 +66,7 @@ var ServerSettings = &Server{
 	GithubProxy:       "",
 }
 
-var NginxLogSettings = &NginxLog{
+var NginxSettings = &Nginx{
 	AccessLogPath: "",
 	ErrorLogPath:  "",
 }
@@ -76,10 +78,10 @@ var GitSettings = &Git{}
 var ConfPath string
 
 var sections = map[string]interface{}{
-	"server":    ServerSettings,
-	"nginx_log": NginxLogSettings,
-	"openai":    OpenAISettings,
-	"git":       GitSettings,
+	"server": ServerSettings,
+	"nginx":  NginxSettings,
+	"openai": OpenAISettings,
+	"git":    GitSettings,
 }
 
 func init() {