starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-09-22 16:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix the issue where the website fails to start after being stopped (#12241)

Browse Source
This commit is contained in:
CityFun
2026-03-20 14:38:18 +08:00
committed by GitHub
parent b05ed1a0ca
commit bbd33c66f1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/service/website.go
+1 -1
View File
@@ -1744,7 +1744,7 @@ func (w WebsiteService) OperateRedirect(req request.NginxRedirectReq) (err error
return buserr.WithErr("ErrUpdateBuWebsite", err)
}
nginxInclude := fmt.Sprintf("/www/sites/%s/redirect/*.conf", website.Alias)
nginxInclude := getWebsiteRedirectInclude(website)
if err = updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: "include", Params: []string{nginxInclude}}}, &website); err != nil {
return
}
agent/app/service/website_utils.go
+6 -2
View File
@@ -99,6 +99,10 @@ func getRootProxyDirectives(proxyPass string) []components.IDirective {
return append([]components.IDirective(nil), locations[0].GetBlock().GetDirectives()...)
}
func getWebsiteRedirectInclude(website model.Website) string {
return fmt.Sprintf("/www/sites/%s/redirect/*.conf", website.Alias)
}
func applyLocationProxyPass(location *components.Location, proxyPass string, sni *bool, proxySSLName string) {
location.UpdateDirective("proxy_pass", []string{proxyPass})
@@ -1052,7 +1056,7 @@ func opWebsite(website *model.Website, operate string) error {
server.RemoveDirective("include", []string{proxyInclude})
rewriteInclude := fmt.Sprintf("/www/sites/%s/rewrite/%s.conf", website.Alias, website.Alias)
server.RemoveDirective("include", []string{rewriteInclude})
redirectInclude := fmt.Sprintf("/www/sites/%s/redirect/%s.conf", website.Alias, website.Alias)
redirectInclude := getWebsiteRedirectInclude(*website)
server.RemoveDirective("include", []string{redirectInclude})
switch website.Type {
@@ -1084,7 +1088,7 @@ func opWebsite(website *model.Website, operate string) error {
if fileOp.Stat(absoluteRewritePath) {
server.UpdateDirective("include", []string{rewriteInclude})
}
redirectInclude := fmt.Sprintf("/www/sites/%s/redirect/%s.conf", website.Alias, website.Alias)
redirectInclude := getWebsiteRedirectInclude(*website)
absoluteRedirectPath := GetSitePath(*website, SiteRedirectDir)
if fileOp.Stat(absoluteRedirectPath) {
server.UpdateDirective("include", []string{redirectInclude})