From 33a08a607df25075fb1b9372d772e4c19f134503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AE=E5=BF=83=E7=89=A9=E8=AF=AD?=
 <108316419+wuhang2003@users.noreply.github.com>
Date: Thu, 3 Aug 2023 22:32:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20openresty=20?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=20(#300)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{1.21.4.1 => 1.21.4.2}/conf/conf.d/00.default.conf          | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/conf.d/default.conf  | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/fastcgi-php.conf     | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/fastcgi_params       | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/mime.types           | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/nginx.conf           | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/data.yml                  | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/docker-compose.yml        | 2 +-
 apps/openresty/{1.21.4.1 => 1.21.4.2}/root/404.html             | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/root/index.html           | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/root/stop/index.html      | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/access.lua | 0
 apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/init.lua   | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/args_check.json | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/cc.json         | 0
 .../www/common/waf/rules/cookie_block.json                      | 0
 .../www/common/waf/rules/file_ext_block.json                    | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/ip_block.json   | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/ip_white.json   | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/post_check.json | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/url_block.json  | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/url_white.json  | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/user_agent.json | 0
 .../{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/warn.html       | 0
 24 files changed, 1 insertion(+), 1 deletion(-)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/conf.d/00.default.conf (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/conf.d/default.conf (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/fastcgi-php.conf (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/fastcgi_params (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/mime.types (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/conf/nginx.conf (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/data.yml (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/docker-compose.yml (92%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/root/404.html (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/root/index.html (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/root/stop/index.html (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/access.lua (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/init.lua (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/args_check.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/cc.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/cookie_block.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/file_ext_block.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/ip_block.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/ip_white.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/post_check.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/url_block.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/url_white.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/user_agent.json (100%)
 rename apps/openresty/{1.21.4.1 => 1.21.4.2}/www/common/waf/rules/warn.html (100%)

diff --git a/apps/openresty/1.21.4.1/conf/conf.d/00.default.conf b/apps/openresty/1.21.4.2/conf/conf.d/00.default.conf
similarity index 100%
rename from apps/openresty/1.21.4.1/conf/conf.d/00.default.conf
rename to apps/openresty/1.21.4.2/conf/conf.d/00.default.conf
diff --git a/apps/openresty/1.21.4.1/conf/conf.d/default.conf b/apps/openresty/1.21.4.2/conf/conf.d/default.conf
similarity index 100%
rename from apps/openresty/1.21.4.1/conf/conf.d/default.conf
rename to apps/openresty/1.21.4.2/conf/conf.d/default.conf
diff --git a/apps/openresty/1.21.4.1/conf/fastcgi-php.conf b/apps/openresty/1.21.4.2/conf/fastcgi-php.conf
similarity index 100%
rename from apps/openresty/1.21.4.1/conf/fastcgi-php.conf
rename to apps/openresty/1.21.4.2/conf/fastcgi-php.conf
diff --git a/apps/openresty/1.21.4.1/conf/fastcgi_params b/apps/openresty/1.21.4.2/conf/fastcgi_params
similarity index 100%
rename from apps/openresty/1.21.4.1/conf/fastcgi_params
rename to apps/openresty/1.21.4.2/conf/fastcgi_params
diff --git a/apps/openresty/1.21.4.1/conf/mime.types b/apps/openresty/1.21.4.2/conf/mime.types
similarity index 100%
rename from apps/openresty/1.21.4.1/conf/mime.types
rename to apps/openresty/1.21.4.2/conf/mime.types
diff --git a/apps/openresty/1.21.4.1/conf/nginx.conf b/apps/openresty/1.21.4.2/conf/nginx.conf
similarity index 100%
rename from apps/openresty/1.21.4.1/conf/nginx.conf
rename to apps/openresty/1.21.4.2/conf/nginx.conf
diff --git a/apps/openresty/1.21.4.1/data.yml b/apps/openresty/1.21.4.2/data.yml
similarity index 100%
rename from apps/openresty/1.21.4.1/data.yml
rename to apps/openresty/1.21.4.2/data.yml
diff --git a/apps/openresty/1.21.4.1/docker-compose.yml b/apps/openresty/1.21.4.2/docker-compose.yml
similarity index 92%
rename from apps/openresty/1.21.4.1/docker-compose.yml
rename to apps/openresty/1.21.4.2/docker-compose.yml
index a04f4bfea..abe74a086 100644
--- a/apps/openresty/1.21.4.1/docker-compose.yml
+++ b/apps/openresty/1.21.4.2/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   openresty:
-    image: openresty/openresty:1.21.4.1-7-focal
+    image: openresty/openresty:1.21.4.2-0-focal
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host
diff --git a/apps/openresty/1.21.4.1/root/404.html b/apps/openresty/1.21.4.2/root/404.html
similarity index 100%
rename from apps/openresty/1.21.4.1/root/404.html
rename to apps/openresty/1.21.4.2/root/404.html
diff --git a/apps/openresty/1.21.4.1/root/index.html b/apps/openresty/1.21.4.2/root/index.html
similarity index 100%
rename from apps/openresty/1.21.4.1/root/index.html
rename to apps/openresty/1.21.4.2/root/index.html
diff --git a/apps/openresty/1.21.4.1/root/stop/index.html b/apps/openresty/1.21.4.2/root/stop/index.html
similarity index 100%
rename from apps/openresty/1.21.4.1/root/stop/index.html
rename to apps/openresty/1.21.4.2/root/stop/index.html
diff --git a/apps/openresty/1.21.4.1/www/common/waf/access.lua b/apps/openresty/1.21.4.2/www/common/waf/access.lua
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/access.lua
rename to apps/openresty/1.21.4.2/www/common/waf/access.lua
diff --git a/apps/openresty/1.21.4.1/www/common/waf/init.lua b/apps/openresty/1.21.4.2/www/common/waf/init.lua
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/init.lua
rename to apps/openresty/1.21.4.2/www/common/waf/init.lua
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/args_check.json b/apps/openresty/1.21.4.2/www/common/waf/rules/args_check.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/args_check.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/args_check.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/cc.json b/apps/openresty/1.21.4.2/www/common/waf/rules/cc.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/cc.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/cc.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/cookie_block.json b/apps/openresty/1.21.4.2/www/common/waf/rules/cookie_block.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/cookie_block.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/cookie_block.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/file_ext_block.json b/apps/openresty/1.21.4.2/www/common/waf/rules/file_ext_block.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/file_ext_block.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/file_ext_block.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/ip_block.json b/apps/openresty/1.21.4.2/www/common/waf/rules/ip_block.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/ip_block.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/ip_block.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/ip_white.json b/apps/openresty/1.21.4.2/www/common/waf/rules/ip_white.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/ip_white.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/ip_white.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/post_check.json b/apps/openresty/1.21.4.2/www/common/waf/rules/post_check.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/post_check.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/post_check.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/url_block.json b/apps/openresty/1.21.4.2/www/common/waf/rules/url_block.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/url_block.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/url_block.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/url_white.json b/apps/openresty/1.21.4.2/www/common/waf/rules/url_white.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/url_white.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/url_white.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/user_agent.json b/apps/openresty/1.21.4.2/www/common/waf/rules/user_agent.json
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/user_agent.json
rename to apps/openresty/1.21.4.2/www/common/waf/rules/user_agent.json
diff --git a/apps/openresty/1.21.4.1/www/common/waf/rules/warn.html b/apps/openresty/1.21.4.2/www/common/waf/rules/warn.html
similarity index 100%
rename from apps/openresty/1.21.4.1/www/common/waf/rules/warn.html
rename to apps/openresty/1.21.4.2/www/common/waf/rules/warn.html