gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-07 17:10:07 +08:00
Code

fix: 解决取消HTTPS报错的BUG

Browse Source
This commit is contained in:
zhengkunwang223 2022-11-28 15:11:39 +08:00 committed by zhengkunwang223
parent b66108ab4a
commit 1f717bea0e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/app/service/website.go
View File

@ -364,6 +364,11 @@ func (w WebsiteService) OpWebsiteHTTPS(req dto.WebsiteHTTPSOp) (dto.WebsiteHTTPS
} else { } else {
website.Protocol = constant.ProtocolHTTP website.Protocol = constant.ProtocolHTTP
website.WebSiteSSLID = 0 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 { if err := deleteNginxConfig(website, getKeysFromStaticFile(dto.SSL)); err != nil {
return dto.WebsiteHTTPS{}, err return dto.WebsiteHTTPS{}, err
} }

2
backend/app/service/website_utils.go
View File

@ -404,7 +404,7 @@ func applySSL(website model.WebSite, websiteSSL model.WebSiteSSL) error {
} }
config := nginxConfig.Config config := nginxConfig.Config
server := config.FindServers()[0] server := config.FindServers()[0]
server.UpdateListen("443", false) server.UpdateListen("443", false, "ssl")
if err := nginx.WriteConfig(config, nginx.IndentedStyle); err != nil { if err := nginx.WriteConfig(config, nginx.IndentedStyle); err != nil {
return err return err
} }