diff --git a/agent/app/service/backup_website.go b/agent/app/service/backup_website.go index ee9d0addb..b0adfd431 100644 --- a/agent/app/service/backup_website.go +++ b/agent/app/service/backup_website.go @@ -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 } diff --git a/agent/app/service/website_utils.go b/agent/app/service/website_utils.go index 3746dfc1e..305f0f2d1 100644 --- a/agent/app/service/website_utils.go +++ b/agent/app/service/website_utils.go @@ -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: