From de265a19b2c18f2780ae3797a2e4838fad850bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E5=90=91=E6=9E=81=E7=AB=AF?= Date: Fri, 26 Sep 2025 10:21:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhttps=E9=98=B2=E7=AA=9C?= =?UTF-8?q?=E7=AB=99=E5=85=B3=E9=97=AD=E6=97=B6=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=AB=99=E7=82=B9=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#10490)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: live --- agent/app/service/nginx_utils.go | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/agent/app/service/nginx_utils.go b/agent/app/service/nginx_utils.go index 55ecf814c..62b39fc93 100644 --- a/agent/app/service/nginx_utils.go +++ b/agent/app/service/nginx_utils.go @@ -119,7 +119,16 @@ func updateDefaultServerConfig(enable bool) error { } defaultConfig.FilePath = defaultConfigPath defaultServer := defaultConfig.FindServers()[0] - updateDefaultServer(defaultServer, nginxInstall.HttpPort, nginxInstall.HttpsPort, enable) + + includeSSL := false + for _, dir := range defaultServer.GetDirectives() { + if dir.GetName() == "include" && dir.GetParameters()[0] == "/usr/local/openresty/nginx/conf/ssl/root_ssl.conf" { + includeSSL = true + break + } + } + updateDefaultServer(defaultServer, nginxInstall.HttpPort, nginxInstall.HttpsPort, enable, includeSSL) + if err = nginx.WriteConfig(defaultConfig, nginx.IndentedStyle); err != nil { return err } @@ -262,11 +271,13 @@ func nginxCheckAndReload(oldContent string, filePath string, containerName strin return nil } -func updateDefaultServer(server *components.Server, httpPort int, httpsPort int, defaultServer bool) { +func updateDefaultServer(server *components.Server, httpPort int, httpsPort int, defaultServer bool, ssl bool) { server.UpdateListen(fmt.Sprintf("%d", httpPort), defaultServer) server.UpdateListen(fmt.Sprintf("[::]:%d", httpPort), defaultServer) - server.UpdateListen(fmt.Sprintf("%d", httpsPort), defaultServer, "ssl") - server.UpdateListen(fmt.Sprintf("[::]:%d", httpsPort), defaultServer, "ssl") - server.UpdateListen(fmt.Sprintf("%d", httpsPort), defaultServer, "quic", "reuseport") - server.UpdateListen(fmt.Sprintf("[::]:%d", httpsPort), defaultServer, "quic", "reuseport") + if ssl { + server.UpdateListen(fmt.Sprintf("%d", httpsPort), defaultServer, "ssl") + server.UpdateListen(fmt.Sprintf("[::]:%d", httpsPort), defaultServer, "ssl") + server.UpdateListen(fmt.Sprintf("%d", httpsPort), defaultServer, "quic", "reuseport") + server.UpdateListen(fmt.Sprintf("[::]:%d", httpsPort), defaultServer, "quic", "reuseport") + } }