From fa06fdf14550a526c4aee9c1860f62dd8db2fe6d Mon Sep 17 00:00:00 2001 From: wanghe-fit2cloud Date: Mon, 26 Feb 2024 16:06:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20OpenResty=20&&=20DataEase=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/dataease/{2.3.1 => 2.3.0}/conf/application.yml | 0 apps/dataease/{2.3.1 => 2.3.0}/data.yml | 0 apps/dataease/{2.3.1 => 2.3.0}/docker-compose.yml | 2 +- .../conf/conf.d/00.default.conf | 0 .../conf/conf.d/default.conf | 0 .../conf/fastcgi-php.conf | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/fastcgi_params | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/mime.types | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/nginx.conf | 0 apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/data.yml | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/docker-compose.yml | 2 +- .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/root/404.html | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/root/index.html | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/root/stop/index.html | 0 .../{1.25.3.1-0-focal => 1.21.4.3-0-focal}/scripts/init.sh | 0 .../www/common/waf/access.lua | 0 .../www/common/waf/init.lua | 0 .../www/common/waf/rules/args_check.json | 0 .../www/common/waf/rules/cc.json | 0 .../www/common/waf/rules/cookie_block.json | 0 .../www/common/waf/rules/file_ext_block.json | 0 .../www/common/waf/rules/ip_block.json | 0 .../www/common/waf/rules/ip_white.json | 0 .../www/common/waf/rules/post_check.json | 0 .../www/common/waf/rules/url_block.json | 0 .../www/common/waf/rules/url_white.json | 0 .../www/common/waf/rules/user_agent.json | 0 .../www/common/waf/rules/warn.html | 0 28 files changed, 2 insertions(+), 2 deletions(-) rename apps/dataease/{2.3.1 => 2.3.0}/conf/application.yml (100%) rename apps/dataease/{2.3.1 => 2.3.0}/data.yml (100%) rename apps/dataease/{2.3.1 => 2.3.0}/docker-compose.yml (99%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/conf.d/00.default.conf (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/conf.d/default.conf (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/fastcgi-php.conf (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/fastcgi_params (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/mime.types (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/conf/nginx.conf (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/data.yml (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/docker-compose.yml (92%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/root/404.html (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/root/index.html (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/root/stop/index.html (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/scripts/init.sh (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/access.lua (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/init.lua (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/args_check.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/cc.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/cookie_block.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/file_ext_block.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/ip_block.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/ip_white.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/post_check.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/url_block.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/url_white.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/user_agent.json (100%) rename apps/openresty/{1.25.3.1-0-focal => 1.21.4.3-0-focal}/www/common/waf/rules/warn.html (100%) diff --git a/apps/dataease/2.3.1/conf/application.yml b/apps/dataease/2.3.0/conf/application.yml similarity index 100% rename from apps/dataease/2.3.1/conf/application.yml rename to apps/dataease/2.3.0/conf/application.yml diff --git a/apps/dataease/2.3.1/data.yml b/apps/dataease/2.3.0/data.yml similarity index 100% rename from apps/dataease/2.3.1/data.yml rename to apps/dataease/2.3.0/data.yml diff --git a/apps/dataease/2.3.1/docker-compose.yml b/apps/dataease/2.3.0/docker-compose.yml similarity index 99% rename from apps/dataease/2.3.1/docker-compose.yml rename to apps/dataease/2.3.0/docker-compose.yml index 820ec305..e54fda4e 100644 --- a/apps/dataease/2.3.1/docker-compose.yml +++ b/apps/dataease/2.3.0/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.1' services: dataease: - image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:v2.3.1 + image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:v2.3.0 restart: always container_name: ${CONTAINER_NAME} ports: diff --git a/apps/openresty/1.25.3.1-0-focal/conf/conf.d/00.default.conf b/apps/openresty/1.21.4.3-0-focal/conf/conf.d/00.default.conf similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/conf/conf.d/00.default.conf rename to apps/openresty/1.21.4.3-0-focal/conf/conf.d/00.default.conf diff --git a/apps/openresty/1.25.3.1-0-focal/conf/conf.d/default.conf b/apps/openresty/1.21.4.3-0-focal/conf/conf.d/default.conf similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/conf/conf.d/default.conf rename to apps/openresty/1.21.4.3-0-focal/conf/conf.d/default.conf diff --git a/apps/openresty/1.25.3.1-0-focal/conf/fastcgi-php.conf b/apps/openresty/1.21.4.3-0-focal/conf/fastcgi-php.conf similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/conf/fastcgi-php.conf rename to apps/openresty/1.21.4.3-0-focal/conf/fastcgi-php.conf diff --git a/apps/openresty/1.25.3.1-0-focal/conf/fastcgi_params b/apps/openresty/1.21.4.3-0-focal/conf/fastcgi_params similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/conf/fastcgi_params rename to apps/openresty/1.21.4.3-0-focal/conf/fastcgi_params diff --git a/apps/openresty/1.25.3.1-0-focal/conf/mime.types b/apps/openresty/1.21.4.3-0-focal/conf/mime.types similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/conf/mime.types rename to apps/openresty/1.21.4.3-0-focal/conf/mime.types diff --git a/apps/openresty/1.25.3.1-0-focal/conf/nginx.conf b/apps/openresty/1.21.4.3-0-focal/conf/nginx.conf similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/conf/nginx.conf rename to apps/openresty/1.21.4.3-0-focal/conf/nginx.conf diff --git a/apps/openresty/1.25.3.1-0-focal/data.yml b/apps/openresty/1.21.4.3-0-focal/data.yml similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/data.yml rename to apps/openresty/1.21.4.3-0-focal/data.yml diff --git a/apps/openresty/1.25.3.1-0-focal/docker-compose.yml b/apps/openresty/1.21.4.3-0-focal/docker-compose.yml similarity index 92% rename from apps/openresty/1.25.3.1-0-focal/docker-compose.yml rename to apps/openresty/1.21.4.3-0-focal/docker-compose.yml index 07f7df21..edbf513a 100644 --- a/apps/openresty/1.25.3.1-0-focal/docker-compose.yml +++ b/apps/openresty/1.21.4.3-0-focal/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: openresty: - image: openresty/openresty:1.25.3.1-0-focal + image: openresty/openresty:1.21.4.3-0-focal container_name: ${CONTAINER_NAME} restart: always network_mode: host diff --git a/apps/openresty/1.25.3.1-0-focal/root/404.html b/apps/openresty/1.21.4.3-0-focal/root/404.html similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/root/404.html rename to apps/openresty/1.21.4.3-0-focal/root/404.html diff --git a/apps/openresty/1.25.3.1-0-focal/root/index.html b/apps/openresty/1.21.4.3-0-focal/root/index.html similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/root/index.html rename to apps/openresty/1.21.4.3-0-focal/root/index.html diff --git a/apps/openresty/1.25.3.1-0-focal/root/stop/index.html b/apps/openresty/1.21.4.3-0-focal/root/stop/index.html similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/root/stop/index.html rename to apps/openresty/1.21.4.3-0-focal/root/stop/index.html diff --git a/apps/openresty/1.25.3.1-0-focal/scripts/init.sh b/apps/openresty/1.21.4.3-0-focal/scripts/init.sh similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/scripts/init.sh rename to apps/openresty/1.21.4.3-0-focal/scripts/init.sh diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/access.lua b/apps/openresty/1.21.4.3-0-focal/www/common/waf/access.lua similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/access.lua rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/access.lua diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/init.lua b/apps/openresty/1.21.4.3-0-focal/www/common/waf/init.lua similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/init.lua rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/init.lua diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/args_check.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/args_check.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/args_check.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/args_check.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/cc.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/cc.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/cc.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/cc.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/cookie_block.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/cookie_block.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/cookie_block.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/cookie_block.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/file_ext_block.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/file_ext_block.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/file_ext_block.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/file_ext_block.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/ip_block.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/ip_block.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/ip_block.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/ip_block.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/ip_white.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/ip_white.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/ip_white.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/ip_white.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/post_check.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/post_check.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/post_check.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/post_check.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/url_block.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/url_block.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/url_block.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/url_block.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/url_white.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/url_white.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/url_white.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/url_white.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/user_agent.json b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/user_agent.json similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/user_agent.json rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/user_agent.json diff --git a/apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/warn.html b/apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/warn.html similarity index 100% rename from apps/openresty/1.25.3.1-0-focal/www/common/waf/rules/warn.html rename to apps/openresty/1.21.4.3-0-focal/www/common/waf/rules/warn.html