diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go index d98a9d37d..fcc3efe6f 100644 --- a/agent/app/service/app_utils.go +++ b/agent/app/service/app_utils.go @@ -1855,7 +1855,7 @@ func handleOpenrestyFile(appInstall *model.AppInstall) error { break } } - if err := handleSSLConfig(appInstall, hasDefaultWebsite); err != nil { + if err := handleSSLConfig(appInstall); err != nil { return err } if len(websites) == 0 { @@ -1884,7 +1884,7 @@ func handleDefaultServer(appInstall *model.AppInstall) error { return nil } -func handleSSLConfig(appInstall *model.AppInstall, defaultWebsite bool) error { +func handleSSLConfig(appInstall *model.AppInstall) error { sslDir := path.Join(appInstall.GetPath(), "conf", "ssl") fileOp := files.NewFileOp() if !fileOp.Stat(sslDir) { @@ -1923,12 +1923,12 @@ func handleSSLConfig(appInstall *model.AppInstall, defaultWebsite bool) error { } defaultConfig.FilePath = defaultConfigPath defaultServer := defaultConfig.FindServers()[0] - defaultServer.UpdateListen(fmt.Sprintf("%d", appInstall.HttpsPort), defaultWebsite, "ssl") - 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), 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("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 { return err } diff --git a/agent/app/service/nginx_utils.go b/agent/app/service/nginx_utils.go index b17bf6aeb..88e088a1b 100644 --- a/agent/app/service/nginx_utils.go +++ b/agent/app/service/nginx_utils.go @@ -103,32 +103,6 @@ func getNginxParamsByKeys(scope string, keys []string, website *model.Website) ( 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 { nginxFull, err := getNginxFull(website) if err != nil { diff --git a/agent/app/service/website.go b/agent/app/service/website.go index ecc1ce976..2e6dc46a7 100644 --- a/agent/app/service/website.go +++ b/agent/app/service/website.go @@ -1296,9 +1296,6 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error { return err } } - if err := updateDefaultServerConfig(!(id > 0)); err != nil { - return err - } if id > 0 { website, err := websiteRepo.GetFirst(repo.WithByID(id)) if err != nil {