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

fix: Fix issue where backing up stream websites fails (#11377)

Browse Source
This commit is contained in:
CityFun
2025-12-17 16:46:51 +08:00
committed by GitHub
parent 61f321a04d
commit e43d7b7a59
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/service/backup_website.go
+2 -2
View File
@@ -131,7 +131,7 @@ func handleWebsiteRecover(website *model.Website, parentTask *task.Task, recover
if err != nil {
return err
}
if err = fileOp.CopyFile(fmt.Sprintf("%s/%s.conf", tmpPath, website.Alias), GetOpenrestyDir(SiteConfDir)); err != nil {
if err = fileOp.CopyFile(fmt.Sprintf("%s/%s.conf", tmpPath, website.Alias), GetConfDir(*website)); err != nil {
return err
}
@@ -259,7 +259,7 @@ func doWebsiteBackup(website *model.Website, parentTask *task.Task, backupDir, f
if err := fileOp.SaveFile(tmpDir+"/website.json", string(remarkInfo), fs.ModePerm); err != nil {
return err
}
nginxConfFile := GetSitePath(*website, SiteConf)
nginxConfFile := GetWebsiteConfigPath(*website)
if err := fileOp.CopyFile(nginxConfFile, tmpDir); err != nil {
return err
}
agent/app/service/website_utils.go
+8 -1
View File
@@ -1428,6 +1428,13 @@ func GetSitePath(website model.Website, confType string) string {
return ""
}
func GetConfDir(website model.Website) string {
if website.Type != constant.Stream {
return GetOpenrestyDir(SiteConf)
}
return GetOpenrestyDir(StreamDir)
}
func GetOpenrestyDir(confType string) string {
switch confType {
case WebsiteRootDir:
@@ -1435,7 +1442,7 @@ func GetOpenrestyDir(confType string) string {
case SiteConfDir:
return path.Join(GetWebSiteRootDir(), "conf.d")
case StreamDir:
return path.Join(GetWebSiteRootDir(), "steam.d")
return path.Join(GetWebSiteRootDir(), "stream.d")
case SitesRootDir:
return path.Join(GetWebSiteRootDir(), "sites")
case DefaultDir: