1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-10 07:26:35 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix issue with set default website error (#8658)

Browse source
This commit is contained in:
CityFun 2025-05-15 11:15:18 +08:00 • committed by GitHub
parent e2ce52f580
commit b4581714fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
agent/app/service/app_utils.go
View file

@ -1855,7 +1855,7 @@ func handleOpenrestyFile(appInstall *model.AppInstall) error {
break break
} }
} }
if err := handleSSLConfig(appInstall, hasDefaultWebsite); err != nil { if err := handleSSLConfig(appInstall); err != nil {
return err return err
} }
if len(websites) == 0 { if len(websites) == 0 {
@ -1884,7 +1884,7 @@ func handleDefaultServer(appInstall *model.AppInstall) error {
return nil return nil
} }
func handleSSLConfig(appInstall *model.AppInstall, defaultWebsite bool) error { func handleSSLConfig(appInstall *model.AppInstall) error {
sslDir := path.Join(appInstall.GetPath(), "conf", "ssl") sslDir := path.Join(appInstall.GetPath(), "conf", "ssl")
fileOp := files.NewFileOp() fileOp := files.NewFileOp()
if !fileOp.Stat(sslDir) { if !fileOp.Stat(sslDir) {
@ -1923,12 +1923,12 @@ func handleSSLConfig(appInstall *model.AppInstall, defaultWebsite bool) error {
} }
defaultConfig.FilePath = defaultConfigPath defaultConfig.FilePath = defaultConfigPath
defaultServer := defaultConfig.FindServers()[0] defaultServer := defaultConfig.FindServers()[0]
defaultServer.UpdateListen(fmt.Sprintf("%d", appInstall.HttpsPort), defaultWebsite, "ssl") defaultServer.UpdateListen(fmt.Sprintf("%d", appInstall.HttpsPort), false, "ssl")
defaultServer.UpdateListen(fmt.Sprintf("[::]:%d", appInstall.HttpsPort), defaultWebsite, "ssl") defaultServer.UpdateListen(fmt.Sprintf("%d", appInstall.HttpsPort), false, "quic", "reuseport")
defaultServer.UpdateListen(fmt.Sprintf("[::]:%d", appInstall.HttpsPort), false, "ssl")
defaultServer.UpdateListen(fmt.Sprintf("[::]:%d", appInstall.HttpsPort), false, "quic", "reuseport")
defaultServer.UpdateDirective("include", []string{"/usr/local/openresty/nginx/conf/ssl/root_ssl.conf"}) defaultServer.UpdateDirective("include", []string{"/usr/local/openresty/nginx/conf/ssl/root_ssl.conf"})
defaultServer.UpdateDirective("http2", []string{"on"}) defaultServer.UpdateDirective("http2", []string{"on"})
defaultServer.UpdateListen(fmt.Sprintf("%d", appInstall.HttpPort), defaultWebsite, "quic", "reuseport")
defaultServer.UpdateListen(fmt.Sprintf("[::]:%d", appInstall.HttpsPort), defaultWebsite, "quic", "reuseport")
if err = nginx.WriteConfig(defaultConfig, nginx.IndentedStyle); err != nil { if err = nginx.WriteConfig(defaultConfig, nginx.IndentedStyle); err != nil {
return err return err
} }

26
agent/app/service/nginx_utils.go
View file

@ -103,32 +103,6 @@ func getNginxParamsByKeys(scope string, keys []string, website *model.Website) (
return res, nil return res, nil
} }
func updateDefaultServerConfig(enable bool) error {
nginxInstall, err := getAppInstallByKey("openresty")
if err != nil {
return err
}
defaultConfigPath := path.Join(nginxInstall.GetPath(), "conf", "default", "00.default.conf")
content, err := os.ReadFile(defaultConfigPath)
if err != nil {
return err
}
defaultConfig, err := parser.NewStringParser(string(content)).Parse()
if err != nil {
return err
}
defaultConfig.FilePath = defaultConfigPath
defaultServer := defaultConfig.FindServers()[0]
defaultServer.UpdateListen("80", enable)
defaultServer.UpdateListen("[::]:80", enable)
defaultServer.UpdateListen("443", enable)
defaultServer.UpdateListen("[::]:443", enable)
if err = nginx.WriteConfig(defaultConfig, nginx.IndentedStyle); err != nil {
return err
}
return nginxCheckAndReload(string(content), defaultConfigPath, nginxInstall.ContainerName)
}
func updateNginxConfig(scope string, params []dto.NginxParam, website *model.Website) error { func updateNginxConfig(scope string, params []dto.NginxParam, website *model.Website) error {
nginxFull, err := getNginxFull(website) nginxFull, err := getNginxFull(website)
if err != nil { if err != nil {

3
agent/app/service/website.go
View file

@ -1296,9 +1296,6 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error {
return err return err
} }
} }
if err := updateDefaultServerConfig(!(id > 0)); err != nil {
return err
}
if id > 0 { if id > 0 {
website, err := websiteRepo.GetFirst(repo.WithByID(id)) website, err := websiteRepo.GetFirst(repo.WithByID(id))
if err != nil { if err != nil {