diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 73e3174a8..da3ff35b8 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -218,7 +218,6 @@ func (w WebsiteService) Recover(req request.WebsiteRecover) error { } fileDir := path.Dir(req.BackupName) pathName := strings.ReplaceAll(path.Base(req.BackupName), ".tar.gz", "") - //fileName := strings.ReplaceAll(req.BackupName[strings.LastIndex(req.BackupName, "/"):], ".tar.gz", "") if err := handleUnTar(req.BackupName, fileDir); err != nil { return err } diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go index 6bb404c3f..27b44d4f3 100644 --- a/backend/app/service/website_utils.go +++ b/backend/app/service/website_utils.go @@ -53,7 +53,7 @@ func createStaticHtml(website *model.Website) error { return err } - indexFolder := path.Join(constant.AppInstallDir, constant.AppNginx, nginxInstall.Name, "www", "sites", website.Alias) + indexFolder := path.Join(constant.AppInstallDir, constant.AppNginx, nginxInstall.Name, "www", "sites", website.Alias, "index") indexPath := path.Join(indexFolder, "index.html") indexContent := string(nginx_conf.Index) fileOp := files.NewFileOp() @@ -87,7 +87,7 @@ func createWebsiteFolder(nginxInstall model.AppInstall, website *model.Website) if err := fileOp.CreateFile(path.Join(siteFolder, "log", "access.log")); err != nil { return err } - if err := fileOp.CreateDir(path.Join(siteFolder, "data"), 0755); err != nil { + if err := fileOp.CreateDir(path.Join(siteFolder, "index"), 0755); err != nil { return err } if err := fileOp.CreateDir(path.Join(siteFolder, "ssl"), 0755); err != nil { @@ -139,7 +139,7 @@ func configDefaultNginx(website *model.Website, domains []model.WebsiteDomain, a proxy := fmt.Sprintf("http://127.0.0.1:%d", appInstall.HttpPort) server.UpdateRootProxy([]string{proxy}) case constant.Static: - server.UpdateRoot(path.Join("/www/sites", website.Alias)) + server.UpdateRoot(path.Join("/www/sites", website.Alias, "index")) server.UpdateRootLocation() case constant.Proxy: server.UpdateRootProxy([]string{website.Proxy}) diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue index cbb7261cc..aef4ba282 100644 --- a/frontend/src/views/website/website/create/index.vue +++ b/frontend/src/views/website/website/create/index.vue @@ -112,6 +112,7 @@