From 1f717bea0edd1d0994068263991082bb08752832 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Mon, 28 Nov 2022 15:11:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88HTTP?= =?UTF-8?q?S=E6=8A=A5=E9=94=99=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/website.go | 5 +++++ backend/app/service/website_utils.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 6382eb377..2ec880c42 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -364,6 +364,11 @@ func (w WebsiteService) OpWebsiteHTTPS(req dto.WebsiteHTTPSOp) (dto.WebsiteHTTPS } else { website.Protocol = constant.ProtocolHTTP website.WebSiteSSLID = 0 + + if err := deleteListenAndServerName(website, []int{443}, []string{}); err != nil { + return dto.WebsiteHTTPS{}, err + } + if err := deleteNginxConfig(website, getKeysFromStaticFile(dto.SSL)); err != nil { return dto.WebsiteHTTPS{}, err } diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go index 6bc625686..b1ef97337 100644 --- a/backend/app/service/website_utils.go +++ b/backend/app/service/website_utils.go @@ -404,7 +404,7 @@ func applySSL(website model.WebSite, websiteSSL model.WebSiteSSL) error { } config := nginxConfig.Config server := config.FindServers()[0] - server.UpdateListen("443", false) + server.UpdateListen("443", false, "ssl") if err := nginx.WriteConfig(config, nginx.IndentedStyle); err != nil { return err }