Skip to content

Commit b14152e

Browse files
fix: Fix issue where backing up stream websites fails
1 parent 2546809 commit b14152e

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

agent/app/service/backup_website.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func handleWebsiteRecover(website *model.Website, parentTask *task.Task, recover
131131
if err != nil {
132132
return err
133133
}
134-
if err = fileOp.CopyFile(fmt.Sprintf("%s/%s.conf", tmpPath, website.Alias), GetOpenrestyDir(SiteConfDir)); err != nil {
134+
if err = fileOp.CopyFile(fmt.Sprintf("%s/%s.conf", tmpPath, website.Alias), GetConfDir(*website)); err != nil {
135135
return err
136136
}
137137

@@ -259,7 +259,7 @@ func doWebsiteBackup(website *model.Website, parentTask *task.Task, backupDir, f
259259
if err := fileOp.SaveFile(tmpDir+"/website.json", string(remarkInfo), fs.ModePerm); err != nil {
260260
return err
261261
}
262-
nginxConfFile := GetSitePath(*website, SiteConf)
262+
nginxConfFile := GetWebsiteConfigPath(*website)
263263
if err := fileOp.CopyFile(nginxConfFile, tmpDir); err != nil {
264264
return err
265265
}

agent/app/service/website_utils.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,14 +1428,21 @@ func GetSitePath(website model.Website, confType string) string {
14281428
return ""
14291429
}
14301430

1431+
func GetConfDir(website model.Website) string {
1432+
if website.Type != constant.Stream {
1433+
return GetOpenrestyDir(SiteConf)
1434+
}
1435+
return GetOpenrestyDir(StreamDir)
1436+
}
1437+
14311438
func GetOpenrestyDir(confType string) string {
14321439
switch confType {
14331440
case WebsiteRootDir:
14341441
return GetWebSiteRootDir()
14351442
case SiteConfDir:
14361443
return path.Join(GetWebSiteRootDir(), "conf.d")
14371444
case StreamDir:
1438-
return path.Join(GetWebSiteRootDir(), "steam.d")
1445+
return path.Join(GetWebSiteRootDir(), "stream.d")
14391446
case SitesRootDir:
14401447
return path.Join(GetWebSiteRootDir(), "sites")
14411448
case DefaultDir:

0 commit comments

Comments
 (0)