From 3b7f8c2724fd786af295268b3b064958632aa316 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:14:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=9D=9E80=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E7=BD=91=E7=AB=99=E5=BC=80=E5=90=AF=20https=20?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=85=8D=E7=BD=AE=20(#5443)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs https://github.com/1Panel-dev/1Panel/issues/5364 --- backend/app/service/website_utils.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go index 0bf55887e..9a45417e7 100644 --- a/backend/app/service/website_utils.go +++ b/backend/app/service/website_utils.go @@ -563,6 +563,16 @@ func applySSL(website model.Website, websiteSSL model.WebsiteSSL, req request.We if err != nil { return nil } + domains, err := websiteDomainRepo.GetBy(websiteDomainRepo.WithWebsiteId(website.ID)) + if err != nil { + return nil + } + noDefaultPort := true + for _, domain := range domains { + if domain.Port == 80 { + noDefaultPort = false + } + } config := nginxFull.SiteConfig.Config server := config.FindServers()[0] @@ -582,13 +592,17 @@ func applySSL(website model.Website, websiteSSL model.WebsiteSSL, req request.We server.RemoveListenByBind(httpPortIPV6) server.RemoveDirective("if", []string{"($scheme"}) case constant.HTTPToHTTPS: - server.UpdateListen(httpPort, website.DefaultServer) + if !noDefaultPort { + server.UpdateListen(httpPort, website.DefaultServer) + } if website.IPV6 { server.UpdateListen(httpPortIPV6, website.DefaultServer) } server.AddHTTP2HTTPS() case constant.HTTPAlso: - server.UpdateListen(httpPort, website.DefaultServer) + if !noDefaultPort { + server.UpdateListen(httpPort, website.DefaultServer) + } server.RemoveDirective("if", []string{"($scheme"}) if website.IPV6 { server.UpdateListen(httpPortIPV6, website.DefaultServer)