From 0de431acc4800461fb889e7a4b0b80881e4bd1c7 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Tue, 8 Aug 2023 17:55:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20openresty=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=20(#311)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/apps/openresty/1.21.4.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/conf/fastcgi-php.conf
rename to apps/openresty/1.21.4.2/conf/fastcgi-php.conf
diff --git a/apps/openresty/1.21.4.2-0-focal/conf/fastcgi_params b/apps/openresty/1.21.4.2/conf/fastcgi_params
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/conf/fastcgi_params
rename to apps/openresty/1.21.4.2/conf/fastcgi_params
diff --git a/apps/openresty/1.21.4.2-0-focal/conf/mime.types b/apps/openresty/1.21.4.2/conf/mime.types
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/conf/mime.types
rename to apps/openresty/1.21.4.2/conf/mime.types
diff --git a/apps/openresty/1.21.4.2-0-focal/conf/nginx.conf b/apps/openresty/1.21.4.2/conf/nginx.conf
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/conf/nginx.conf
rename to apps/openresty/1.21.4.2/conf/nginx.conf
diff --git a/apps/openresty/1.21.4.2-0-focal/data.yml b/apps/openresty/1.21.4.2/data.yml
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/data.yml
rename to apps/openresty/1.21.4.2/data.yml
diff --git a/apps/openresty/1.21.4.2-0-focal/docker-compose.yml b/apps/openresty/1.21.4.2/docker-compose.yml
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/docker-compose.yml
rename to apps/openresty/1.21.4.2/docker-compose.yml
diff --git a/apps/openresty/1.21.4.2-0-focal/root/404.html b/apps/openresty/1.21.4.2/root/404.html
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/root/404.html
rename to apps/openresty/1.21.4.2/root/404.html
diff --git a/apps/openresty/1.21.4.2-0-focal/root/index.html b/apps/openresty/1.21.4.2/root/index.html
similarity index 100%
rename from apps/openresty/1.21.4.2-0-focal/root/index.html
rename to apps/openresty/1.21.4.2/root/index.html
diff --git a/apps/openresty/1.21.4.2-0-focal/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.2-0-focal/root/stop/index.html
rename to apps/openresty/1.21.4.2/root/stop/index.html
diff --git a/apps/openresty/1.21.4.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/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.2-0-focal/www/common/waf/rules/warn.html
rename to apps/openresty/1.21.4.2/www/common/waf/rules/warn.html
diff --git a/apps/php5/data.yml b/apps/php5/data.yml
index 79ac88b8..b4b64e87 100755
--- a/apps/php5/data.yml
+++ b/apps/php5/data.yml
@@ -14,7 +14,6 @@ additionalProperties:
     type: php
     crossVersionUpdate: false
     limit: 0
-    recommend: 9998
     website: https://www.php.net/
     github: https://github.com/php/php-src
     document: https://www.php.net/docs.php