From e1f00795850d4789b9172b4bfceff8e2dda7a297 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Mon, 5 Dec 2022 15:31:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9nginx=E4=B8=BAOpenRes?=
 =?UTF-8?q?ty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/list.json                                         | 10 +++++-----
 apps/nginx/versions/{1.23.1 => 1.21.4}/README.md       |  0
 .../{1.23.1 => 1.21.4}/conf/conf.d/default.conf        |  0
 apps/nginx/versions/{1.23.1 => 1.21.4}/conf/mime.types |  0
 apps/nginx/versions/{1.23.1 => 1.21.4}/conf/nginx.conf |  0
 apps/nginx/versions/{1.23.1 => 1.21.4}/config.json     |  0
 .../versions/{1.23.1 => 1.21.4}/docker-compose.yml     |  0
 apps/nginx/versions/{1.23.1 => 1.21.4}/html/index.html |  0
 apps/nginx/versions/{1.23.1 => 1.21.4}/root/index.html |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/access.lua       |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/init.lua         |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/args       |  0
 .../www/common/waf/rules/blackfileExt                  |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/ccrate     |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/cookie     |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/html       |  0
 .../www/common/waf/rules/ipBlocklist                   |  0
 .../www/common/waf/rules/ipWhitelist                   |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/post       |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/url        |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/user-agent |  0
 .../{1.23.1 => 1.21.4}/www/common/waf/rules/whiteurl   |  0
 22 files changed, 5 insertions(+), 5 deletions(-)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/README.md (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/conf/conf.d/default.conf (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/conf/mime.types (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/conf/nginx.conf (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/config.json (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/docker-compose.yml (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/html/index.html (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/root/index.html (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/access.lua (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/init.lua (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/args (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/blackfileExt (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/ccrate (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/cookie (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/html (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/ipBlocklist (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/ipWhitelist (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/post (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/url (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/user-agent (100%)
 rename apps/nginx/versions/{1.23.1 => 1.21.4}/www/common/waf/rules/whiteurl (100%)

diff --git a/apps/list.json b/apps/list.json
index 1b64cbce9..019446c99 100644
--- a/apps/list.json
+++ b/apps/list.json
@@ -34,16 +34,16 @@
     },
     {
       "key": "nginx",
-      "name": "Nginx",
+      "name": "OpenResty",
       "tags": ["Server"],
-      "versions": ["1.23.1"],
-      "short_desc": "高性能的 HTTP 和反向代理服务器",
-      "author": "Nginx",
+      "versions": ["1.21.4"],
+      "short_desc": "基于 Nginx 和 LuaJIT 的高性能 Web 平台",
+      "author": "OpenResty",
       "type": "runtime",
       "required": [],
       "limit": 1,
       "crossVersionUpdate": true,
-      "source": "http://nginx.org/"
+      "source": "https://openresty.org/"
     },
     {
       "key": "wordpress",
diff --git a/apps/nginx/versions/1.23.1/README.md b/apps/nginx/versions/1.21.4/README.md
similarity index 100%
rename from apps/nginx/versions/1.23.1/README.md
rename to apps/nginx/versions/1.21.4/README.md
diff --git a/apps/nginx/versions/1.23.1/conf/conf.d/default.conf b/apps/nginx/versions/1.21.4/conf/conf.d/default.conf
similarity index 100%
rename from apps/nginx/versions/1.23.1/conf/conf.d/default.conf
rename to apps/nginx/versions/1.21.4/conf/conf.d/default.conf
diff --git a/apps/nginx/versions/1.23.1/conf/mime.types b/apps/nginx/versions/1.21.4/conf/mime.types
similarity index 100%
rename from apps/nginx/versions/1.23.1/conf/mime.types
rename to apps/nginx/versions/1.21.4/conf/mime.types
diff --git a/apps/nginx/versions/1.23.1/conf/nginx.conf b/apps/nginx/versions/1.21.4/conf/nginx.conf
similarity index 100%
rename from apps/nginx/versions/1.23.1/conf/nginx.conf
rename to apps/nginx/versions/1.21.4/conf/nginx.conf
diff --git a/apps/nginx/versions/1.23.1/config.json b/apps/nginx/versions/1.21.4/config.json
similarity index 100%
rename from apps/nginx/versions/1.23.1/config.json
rename to apps/nginx/versions/1.21.4/config.json
diff --git a/apps/nginx/versions/1.23.1/docker-compose.yml b/apps/nginx/versions/1.21.4/docker-compose.yml
similarity index 100%
rename from apps/nginx/versions/1.23.1/docker-compose.yml
rename to apps/nginx/versions/1.21.4/docker-compose.yml
diff --git a/apps/nginx/versions/1.23.1/html/index.html b/apps/nginx/versions/1.21.4/html/index.html
similarity index 100%
rename from apps/nginx/versions/1.23.1/html/index.html
rename to apps/nginx/versions/1.21.4/html/index.html
diff --git a/apps/nginx/versions/1.23.1/root/index.html b/apps/nginx/versions/1.21.4/root/index.html
similarity index 100%
rename from apps/nginx/versions/1.23.1/root/index.html
rename to apps/nginx/versions/1.21.4/root/index.html
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/access.lua b/apps/nginx/versions/1.21.4/www/common/waf/access.lua
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/access.lua
rename to apps/nginx/versions/1.21.4/www/common/waf/access.lua
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/init.lua b/apps/nginx/versions/1.21.4/www/common/waf/init.lua
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/init.lua
rename to apps/nginx/versions/1.21.4/www/common/waf/init.lua
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/args b/apps/nginx/versions/1.21.4/www/common/waf/rules/args
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/args
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/args
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/blackfileExt b/apps/nginx/versions/1.21.4/www/common/waf/rules/blackfileExt
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/blackfileExt
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/blackfileExt
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/ccrate b/apps/nginx/versions/1.21.4/www/common/waf/rules/ccrate
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/ccrate
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/ccrate
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/cookie b/apps/nginx/versions/1.21.4/www/common/waf/rules/cookie
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/cookie
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/cookie
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/html b/apps/nginx/versions/1.21.4/www/common/waf/rules/html
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/html
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/html
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/ipBlocklist b/apps/nginx/versions/1.21.4/www/common/waf/rules/ipBlocklist
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/ipBlocklist
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/ipBlocklist
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/ipWhitelist b/apps/nginx/versions/1.21.4/www/common/waf/rules/ipWhitelist
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/ipWhitelist
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/ipWhitelist
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/post b/apps/nginx/versions/1.21.4/www/common/waf/rules/post
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/post
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/post
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/url b/apps/nginx/versions/1.21.4/www/common/waf/rules/url
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/url
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/url
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/user-agent b/apps/nginx/versions/1.21.4/www/common/waf/rules/user-agent
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/user-agent
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/user-agent
diff --git a/apps/nginx/versions/1.23.1/www/common/waf/rules/whiteurl b/apps/nginx/versions/1.21.4/www/common/waf/rules/whiteurl
similarity index 100%
rename from apps/nginx/versions/1.23.1/www/common/waf/rules/whiteurl
rename to apps/nginx/versions/1.21.4/www/common/waf/rules/whiteurl