From 5f321f91a9f5fa1865af50b5b2fad3fc468d3a91 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Sun, 4 Dec 2022 15:59:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E5=A2=9E=E5=8A=A0lab?= =?UTF-8?q?el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/halo/versions/1.6.0/docker-compose.yml | 3 ++- apps/mysql/versions/5.7.39/docker-compose.yml | 3 ++- apps/mysql/versions/8.0.30/docker-compose.yml | 2 ++ apps/nginx/versions/1.23.1/docker-compose.yml | 2 ++ apps/phpmyadmin/versions/5.2.0/docker-compose.yml | 2 ++ apps/redis-commander/versions/0.8.0/docker-compose.yml | 2 ++ apps/redis/versions/6.0.16/docker-compose.yml | 3 +++ apps/redis/versions/7.0.5/docker-compose.yml | 3 +++ apps/wordpress/versions/6.0.1/docker-compose.yml | 2 ++ apps/wordpress/versions/6.0.2/docker-compose.yml | 2 ++ backend/app/service/website_utils.go | 5 +---- 11 files changed, 23 insertions(+), 6 deletions(-) diff --git a/apps/halo/versions/1.6.0/docker-compose.yml b/apps/halo/versions/1.6.0/docker-compose.yml index 59ba94b66..f2b1c83c2 100644 --- a/apps/halo/versions/1.6.0/docker-compose.yml +++ b/apps/halo/versions/1.6.0/docker-compose.yml @@ -18,7 +18,8 @@ services: SPRING_DATASOURCE_PASSWORD: ${PANEL_DB_USER_PASSWORD} HALO_ADMIN_PATH: admin HALO_CACHE: memory - + labels: + createdBy: "apps" networks: 1panel: external: true \ No newline at end of file diff --git a/apps/mysql/versions/5.7.39/docker-compose.yml b/apps/mysql/versions/5.7.39/docker-compose.yml index 3bd41e120..31f4f1d9b 100644 --- a/apps/mysql/versions/5.7.39/docker-compose.yml +++ b/apps/mysql/versions/5.7.39/docker-compose.yml @@ -20,7 +20,8 @@ services: --collation-server=utf8mb4_general_ci --explicit_defaults_for_timestamp=true --lower_case_table_names=1 - + labels: + createdBy: "apps" networks: 1panel: external: true \ No newline at end of file diff --git a/apps/mysql/versions/8.0.30/docker-compose.yml b/apps/mysql/versions/8.0.30/docker-compose.yml index 8c6c3ee75..bad80bcff 100644 --- a/apps/mysql/versions/8.0.30/docker-compose.yml +++ b/apps/mysql/versions/8.0.30/docker-compose.yml @@ -15,6 +15,8 @@ services: - ./data/:/var/lib/mysql - ./conf/my.cnf:/etc/my.cnf - ./log:/var/log/mysql + labels: + createdBy: "apps" networks: 1panel: diff --git a/apps/nginx/versions/1.23.1/docker-compose.yml b/apps/nginx/versions/1.23.1/docker-compose.yml index 88116ebfc..894f97389 100644 --- a/apps/nginx/versions/1.23.1/docker-compose.yml +++ b/apps/nginx/versions/1.23.1/docker-compose.yml @@ -10,3 +10,5 @@ services: - ./conf/conf.d:/usr/local/openresty/nginx/conf/conf.d/ - ./www:/www - ./root:/usr/share/nginx/html + labels: + createdBy: "apps" diff --git a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml b/apps/phpmyadmin/versions/5.2.0/docker-compose.yml index d586d5cca..b9aa21cd0 100644 --- a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml +++ b/apps/phpmyadmin/versions/5.2.0/docker-compose.yml @@ -9,6 +9,8 @@ services: - PMA_HOST=${PANEL_DB_HOST} networks: - 1panel + labels: + createdBy: "apps" networks: 1panel: diff --git a/apps/redis-commander/versions/0.8.0/docker-compose.yml b/apps/redis-commander/versions/0.8.0/docker-compose.yml index 1e700190d..b2bbffbc7 100644 --- a/apps/redis-commander/versions/0.8.0/docker-compose.yml +++ b/apps/redis-commander/versions/0.8.0/docker-compose.yml @@ -11,6 +11,8 @@ services: - REDIS_HOSTS=1panel:${PANEL_REDIS_HOST}:6379:0:${PANEL_DB_ROOT_PASSWORD} ports: - ${PANEL_APP_PORT_HTTP}:8081 + labels: + createdBy: "apps" networks: 1panel: external: true \ No newline at end of file diff --git a/apps/redis/versions/6.0.16/docker-compose.yml b/apps/redis/versions/6.0.16/docker-compose.yml index 7e9aa82ca..af1730302 100644 --- a/apps/redis/versions/6.0.16/docker-compose.yml +++ b/apps/redis/versions/6.0.16/docker-compose.yml @@ -12,6 +12,9 @@ services: - ./data:/data - ./conf/redis.conf:/etc/redis/redis.conf - ./logs:/logs + labels: + createdBy: "apps" + networks: 1panel: external: true \ No newline at end of file diff --git a/apps/redis/versions/7.0.5/docker-compose.yml b/apps/redis/versions/7.0.5/docker-compose.yml index 9f6961135..c0e4f86a2 100644 --- a/apps/redis/versions/7.0.5/docker-compose.yml +++ b/apps/redis/versions/7.0.5/docker-compose.yml @@ -12,6 +12,9 @@ services: - ./data:/data - ./conf/redis.conf:/etc/redis/redis.conf - ./logs:/logs + labels: + createdBy: "apps" + networks: 1panel: external: true \ No newline at end of file diff --git a/apps/wordpress/versions/6.0.1/docker-compose.yml b/apps/wordpress/versions/6.0.1/docker-compose.yml index 1e4ea35fd..0e38cc7f2 100644 --- a/apps/wordpress/versions/6.0.1/docker-compose.yml +++ b/apps/wordpress/versions/6.0.1/docker-compose.yml @@ -16,6 +16,8 @@ services: WORDPRESS_DB_USER: ${PANEL_DB_USER} WORDPRESS_DB_PASSWORD: ${PANEL_DB_USER_PASSWORD} WORDPRESS_DEBUG: 1 + labels: + createdBy: "apps" networks: 1panel: diff --git a/apps/wordpress/versions/6.0.2/docker-compose.yml b/apps/wordpress/versions/6.0.2/docker-compose.yml index cdca9269e..cc1dddfdf 100644 --- a/apps/wordpress/versions/6.0.2/docker-compose.yml +++ b/apps/wordpress/versions/6.0.2/docker-compose.yml @@ -16,6 +16,8 @@ services: WORDPRESS_DB_USER: ${PANEL_DB_USER} WORDPRESS_DB_PASSWORD: ${PANEL_DB_USER_PASSWORD} WORDPRESS_DEBUG: 1 + labels: + createdBy: "apps" networks: 1panel: diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go index b1be47426..187ebf0f5 100644 --- a/backend/app/service/website_utils.go +++ b/backend/app/service/website_utils.go @@ -81,9 +81,6 @@ 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, "waf", "rules"), 0755); err != nil { - return err - } if err := fileOp.CreateDir(path.Join(siteFolder, "data"), 0755); err != nil { return err } @@ -91,7 +88,7 @@ func createWebsiteFolder(nginxInstall model.AppInstall, website *model.WebSite) return err } } - return fileOp.CopyDir(path.Join(nginxFolder, "www", "common", "waf", "rules"), path.Join(siteFolder, "waf", "rules")) + return fileOp.CopyDir(path.Join(nginxFolder, "www", "common", "waf", "rules"), path.Join(siteFolder, "waf")) } func configDefaultNginx(website *model.WebSite, domains []model.WebSiteDomain) error {