1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-09 15:06:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix issue with re-enable the website failed (#8731)

Browse source
This commit is contained in:
CityFun 2025-05-19 15:41:47 +08:00 • committed by GitHub
parent 8e5e0b0d88
commit 1735baf657
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agent/app/service/website_utils.go
View file

@ -886,14 +886,14 @@ func opWebsite(website *model.Website, operate string) error {
website.Status = constant.WebStopped website.Status = constant.WebStopped
} }
if operate == constant.StartWeb { if operate == constant.StartWeb {
absoluteIncludeDir := path.Join(nginxInstall.Install.GetPath(), fmt.Sprintf("/www/sites/%s/proxy", website.Alias)) absoluteIncludeDir := GetSitePath(*website, SiteProxyDir)
fileOp := files.NewFileOp() fileOp := files.NewFileOp()
if fileOp.Stat(absoluteIncludeDir) && !files.IsEmptyDir(absoluteIncludeDir) { if fileOp.Stat(absoluteIncludeDir) && !files.IsEmptyDir(absoluteIncludeDir) {
proxyInclude := fmt.Sprintf("/www/sites/%s/proxy/*.conf", website.Alias) proxyInclude := fmt.Sprintf("/www/sites/%s/proxy/*.conf", website.Alias)
server.UpdateDirective("include", []string{proxyInclude}) server.UpdateDirective("include", []string{proxyInclude})
} }
rewriteInclude := fmt.Sprintf("/www/sites/%s/rewrite/%s.conf", website.Alias, website.Alias) rewriteInclude := fmt.Sprintf("/www/sites/%s/rewrite/%s.conf", website.Alias, website.Alias)
absoluteRewritePath := path.Join(nginxInstall.Install.GetPath(), rewriteInclude) absoluteRewritePath := GetSitePath(*website, SiteReWritePath)
if fileOp.Stat(absoluteRewritePath) { if fileOp.Stat(absoluteRewritePath) {
server.UpdateDirective("include", []string{rewriteInclude}) server.UpdateDirective("include", []string{rewriteInclude})
} }
@ -924,7 +924,7 @@ func opWebsite(website *model.Website, operate string) error {
} }
if runtime.Type == constant.RuntimePHP { if runtime.Type == constant.RuntimePHP {
if website.ProxyType == constant.RuntimeProxyUnix || website.ProxyType == constant.RuntimeProxyTcp { if website.ProxyType == constant.RuntimeProxyUnix || website.ProxyType == constant.RuntimeProxyTcp {
localPath = path.Join(nginxInstall.Install.GetPath(), rootIndex, "index.php") localPath = path.Join(GetSitePath(*website, SiteIndexDir), "index.php")
} }
server.UpdatePHPProxy([]string{website.Proxy}, localPath) server.UpdatePHPProxy([]string{website.Proxy}, localPath)
} else { } else {