From 035ca6958b3d5b6f36baab8e8b108c10a2bdd37e Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:27:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=20openresty=20?= =?UTF-8?q?=E5=88=B0=201.25.3.2=20(#2004)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conf/conf.d/00.default.conf | 18 -------- .../1pwaf/data/conf/.aes_key | 0 .../1pwaf/data/conf/.secret | 0 .../1pwaf/data/conf/global.json | 0 .../1pwaf/data/conf/monitor.json | 0 .../1pwaf/data/conf/siteConfig.json | 0 .../1pwaf/data/conf/sites.json | 0 .../1pwaf/data/conf/token | 0 .../1pwaf/data/conf/waf.conf | 0 .../1pwaf/data/conf/waf.json | 0 .../1pwaf/data/default/cc.html | 0 .../1pwaf/data/default/forbidden.html | 0 .../1pwaf/data/default/geo.html | 0 .../1pwaf/data/default/global.json | 0 .../1pwaf/data/default/ip.html | 0 .../1pwaf/data/default/monitor.json | 0 .../1pwaf/data/default/unknown.html | 0 .../1pwaf/data/html/5s.html | 0 .../1pwaf/data/html/5s.js | 0 .../1pwaf/data/html/cc.html | 0 .../1pwaf/data/html/forbidden.html | 0 .../1pwaf/data/html/geo.html | 0 .../1pwaf/data/html/ip.html | 0 .../1pwaf/data/html/redirect.html | 0 .../1pwaf/data/html/slide.html | 0 .../1pwaf/data/html/slide.js | 0 .../1pwaf/data/html/unknown.html | 0 .../1pwaf/data/rules/acl.json | 0 .../1pwaf/data/rules/args.json | 0 .../1pwaf/data/rules/cdn.json | 0 .../1pwaf/data/rules/cookie.json | 0 .../1pwaf/data/rules/defaultUaBlack.json | 0 .../1pwaf/data/rules/defaultUrlBlack.json | 0 .../1pwaf/data/rules/fileExt.json | 0 .../1pwaf/data/rules/header.json | 0 .../1pwaf/data/rules/ipBlack.json | 0 .../1pwaf/data/rules/ipWhite.json | 0 .../1pwaf/data/rules/methodWhite.json | 0 .../1pwaf/data/rules/post.json | 0 .../1pwaf/data/rules/uaBlack.json | 0 .../1pwaf/data/rules/uaWhite.json | 0 .../1pwaf/data/rules/urlBlack.json | 0 .../1pwaf/data/rules/urlWhite.json | 0 .../conf/conf.d/00.default.conf | 8 ++++ .../conf/conf.d/default.conf | 0 .../conf/fastcgi-php.conf | 0 .../conf/fastcgi_params | 0 .../conf/mime.types | 0 .../conf/nginx.conf | 0 openresty/1.25.3.2-0-1-focal/data.yml | 45 +++++++++++++++++++ .../docker-compose.yml | 4 +- .../root/404.html | 0 .../root/index.html | 0 .../root/stop/index.html | 0 .../scripts/init.sh | 0 .../1.25.3.2-0-1-focal/scripts/upgrade.sh | 12 +++++ 56 files changed, 67 insertions(+), 20 deletions(-) delete mode 100644 openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/.aes_key (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/.secret (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/global.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/monitor.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/siteConfig.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/sites.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/token (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/waf.conf (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/conf/waf.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/cc.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/forbidden.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/geo.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/global.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/ip.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/monitor.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/default/unknown.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/5s.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/5s.js (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/cc.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/forbidden.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/geo.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/ip.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/redirect.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/slide.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/slide.js (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/html/unknown.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/acl.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/args.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/cdn.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/cookie.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/defaultUaBlack.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/defaultUrlBlack.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/fileExt.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/header.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/ipBlack.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/ipWhite.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/methodWhite.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/post.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/uaBlack.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/uaWhite.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/urlBlack.json (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/1pwaf/data/rules/urlWhite.json (100%) create mode 100644 openresty/1.25.3.2-0-1-focal/conf/conf.d/00.default.conf rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/conf/conf.d/default.conf (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/conf/fastcgi-php.conf (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/conf/fastcgi_params (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/conf/mime.types (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/conf/nginx.conf (100%) create mode 100755 openresty/1.25.3.2-0-1-focal/data.yml rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/docker-compose.yml (89%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/root/404.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/root/index.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/root/stop/index.html (100%) rename openresty/{1.21.4.3-3-3-focal => 1.25.3.2-0-1-focal}/scripts/init.sh (100%) create mode 100644 openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh diff --git a/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf b/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf deleted file mode 100644 index aa768b259..000000000 --- a/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf +++ /dev/null @@ -1,18 +0,0 @@ -map "" $empty { - default ""; -} - -server -{ - listen 80; - listen 443 ssl http2; - server_name _; - - ssl_ciphers aNULL; - ssl_certificate data:$empty; - ssl_certificate_key data:$empty; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - - index 404.html; - root /usr/share/nginx/html; -} \ No newline at end of file diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.aes_key b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/.aes_key similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.aes_key rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/.aes_key diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.secret b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/.secret similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.secret rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/.secret diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/global.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/global.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/global.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/global.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/monitor.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/monitor.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/monitor.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/monitor.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/siteConfig.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/siteConfig.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/siteConfig.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/siteConfig.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/sites.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/sites.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/sites.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/sites.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/token b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/token similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/token rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/token diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.conf b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/waf.conf similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.conf rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/waf.conf diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/waf.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/conf/waf.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/cc.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/cc.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/cc.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/cc.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/forbidden.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/forbidden.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/forbidden.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/forbidden.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/geo.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/geo.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/geo.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/geo.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/global.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/global.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/global.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/global.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/ip.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/ip.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/ip.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/ip.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/monitor.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/monitor.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/monitor.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/monitor.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/unknown.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/default/unknown.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/default/unknown.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/default/unknown.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/5s.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/5s.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.js b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/5s.js similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.js rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/5s.js diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/cc.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/cc.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/cc.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/cc.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/forbidden.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/forbidden.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/forbidden.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/forbidden.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/geo.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/geo.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/geo.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/geo.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/ip.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/ip.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/ip.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/ip.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/redirect.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/redirect.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/redirect.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/redirect.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/slide.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/slide.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.js b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/slide.js similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.js rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/slide.js diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/unknown.html b/openresty/1.25.3.2-0-1-focal/1pwaf/data/html/unknown.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/html/unknown.html rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/html/unknown.html diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/acl.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/acl.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/acl.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/acl.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/args.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/args.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/args.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/args.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cdn.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/cdn.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cdn.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/cdn.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cookie.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/cookie.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cookie.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/cookie.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUaBlack.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/defaultUaBlack.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUaBlack.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/defaultUaBlack.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUrlBlack.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/defaultUrlBlack.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUrlBlack.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/defaultUrlBlack.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/fileExt.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/fileExt.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/fileExt.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/fileExt.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/header.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/header.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/header.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/header.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipBlack.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/ipBlack.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipBlack.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/ipBlack.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipWhite.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/ipWhite.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipWhite.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/ipWhite.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/methodWhite.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/methodWhite.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/methodWhite.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/methodWhite.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/post.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/post.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/post.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/post.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaBlack.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/uaBlack.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaBlack.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/uaBlack.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaWhite.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/uaWhite.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaWhite.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/uaWhite.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlBlack.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/urlBlack.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlBlack.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/urlBlack.json diff --git a/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlWhite.json b/openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/urlWhite.json similarity index 100% rename from openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlWhite.json rename to openresty/1.25.3.2-0-1-focal/1pwaf/data/rules/urlWhite.json diff --git a/openresty/1.25.3.2-0-1-focal/conf/conf.d/00.default.conf b/openresty/1.25.3.2-0-1-focal/conf/conf.d/00.default.conf new file mode 100644 index 000000000..6cad22181 --- /dev/null +++ b/openresty/1.25.3.2-0-1-focal/conf/conf.d/00.default.conf @@ -0,0 +1,8 @@ +server +{ + listen 80; + server_name _; + + index 404.html; + root /usr/share/nginx/html; +} \ No newline at end of file diff --git a/openresty/1.21.4.3-3-3-focal/conf/conf.d/default.conf b/openresty/1.25.3.2-0-1-focal/conf/conf.d/default.conf similarity index 100% rename from openresty/1.21.4.3-3-3-focal/conf/conf.d/default.conf rename to openresty/1.25.3.2-0-1-focal/conf/conf.d/default.conf diff --git a/openresty/1.21.4.3-3-3-focal/conf/fastcgi-php.conf b/openresty/1.25.3.2-0-1-focal/conf/fastcgi-php.conf similarity index 100% rename from openresty/1.21.4.3-3-3-focal/conf/fastcgi-php.conf rename to openresty/1.25.3.2-0-1-focal/conf/fastcgi-php.conf diff --git a/openresty/1.21.4.3-3-3-focal/conf/fastcgi_params b/openresty/1.25.3.2-0-1-focal/conf/fastcgi_params similarity index 100% rename from openresty/1.21.4.3-3-3-focal/conf/fastcgi_params rename to openresty/1.25.3.2-0-1-focal/conf/fastcgi_params diff --git a/openresty/1.21.4.3-3-3-focal/conf/mime.types b/openresty/1.25.3.2-0-1-focal/conf/mime.types similarity index 100% rename from openresty/1.21.4.3-3-3-focal/conf/mime.types rename to openresty/1.25.3.2-0-1-focal/conf/mime.types diff --git a/openresty/1.21.4.3-3-3-focal/conf/nginx.conf b/openresty/1.25.3.2-0-1-focal/conf/nginx.conf similarity index 100% rename from openresty/1.21.4.3-3-3-focal/conf/nginx.conf rename to openresty/1.25.3.2-0-1-focal/conf/nginx.conf diff --git a/openresty/1.25.3.2-0-1-focal/data.yml b/openresty/1.25.3.2-0-1-focal/data.yml new file mode 100755 index 000000000..53e3651d8 --- /dev/null +++ b/openresty/1.25.3.2-0-1-focal/data.yml @@ -0,0 +1,45 @@ +additionalProperties: + formFields: + - default: 80 + envKey: PANEL_APP_PORT_HTTP + labelEn: HTTP Port + labelZh: HTTP 端口 + required: true + type: number + label: + en: HTTP Port + ja: HTTP ポート + ms: Port HTTP + pt-br: Porta HTTP + ru: HTTP Порт + zh-Hant: HTTP 端口 + zh: HTTP 端口 + - default: 443 + envKey: PANEL_APP_PORT_HTTPS + labelEn: HTTPS Port + labelZh: HTTPS 端口 + required: true + type: number + label: + en: HTTPS Port + ja: HTTPS ポート + ms: Port HTTPS + pt-br: Porta HTTPS + ru: HTTPS Порт + zh-Hant: HTTPS 端口 + zh: HTTPS 端口 + - default: www + envKey: WEBSITE_DIR + labelEn: Website Dir + labelZh: 网站目录(网站目录会放置在 1Panel 安装目录下) + required: true + type: string + label: + en: Website directory (The website directory will be placed under the 1Panel installation directory) + ja: ウェブサイトディレクトリ（ウェブサイトディレクトリは 1Panel インストールディレクトリに配置されます） + ms: Direktori laman web (Direktori laman web akan diletakkan di bawah direktori pemasangan 1Panel) + pt-br: Diretório do site (O diretório do site será colocado sob o diretório de instalação do 1Panel) + ru: Директория сайта (Директория сайта будет размещена в каталоге установки 1Panel) + zh-Hant: 網站目錄（網站目錄將放置在 1Panel 安裝目錄下） + zh: 网站目录（网站目录会放置在 1Panel 安装目录下） + diff --git a/openresty/1.21.4.3-3-3-focal/docker-compose.yml b/openresty/1.25.3.2-0-1-focal/docker-compose.yml similarity index 89% rename from openresty/1.21.4.3-3-3-focal/docker-compose.yml rename to openresty/1.25.3.2-0-1-focal/docker-compose.yml index bd44da1a1..1e76420d0 100644 --- a/openresty/1.21.4.3-3-3-focal/docker-compose.yml +++ b/openresty/1.25.3.2-0-1-focal/docker-compose.yml @@ -1,6 +1,6 @@ services: openresty: - image: 1panel/openresty:1.21.4.3-3-3-focal + image: 1panel/openresty:1.25.3.2-0-1-focal container_name: ${CONTAINER_NAME} restart: always network_mode: host @@ -11,7 +11,7 @@ services: - ./conf/mime.types:/usr/local/openresty/nginx/conf/mime.types - ./log:/var/log/nginx - ./conf/conf.d:/usr/local/openresty/nginx/conf/conf.d/ - - ./www:/www + - ${WEBSITE_DIR}:/www - ./root:/usr/share/nginx/html - /etc/localtime:/etc/localtime - ./1pwaf/data:/usr/local/openresty/1pwaf/data diff --git a/openresty/1.21.4.3-3-3-focal/root/404.html b/openresty/1.25.3.2-0-1-focal/root/404.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/root/404.html rename to openresty/1.25.3.2-0-1-focal/root/404.html diff --git a/openresty/1.21.4.3-3-3-focal/root/index.html b/openresty/1.25.3.2-0-1-focal/root/index.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/root/index.html rename to openresty/1.25.3.2-0-1-focal/root/index.html diff --git a/openresty/1.21.4.3-3-3-focal/root/stop/index.html b/openresty/1.25.3.2-0-1-focal/root/stop/index.html similarity index 100% rename from openresty/1.21.4.3-3-3-focal/root/stop/index.html rename to openresty/1.25.3.2-0-1-focal/root/stop/index.html diff --git a/openresty/1.21.4.3-3-3-focal/scripts/init.sh b/openresty/1.25.3.2-0-1-focal/scripts/init.sh similarity index 100% rename from openresty/1.21.4.3-3-3-focal/scripts/init.sh rename to openresty/1.25.3.2-0-1-focal/scripts/init.sh diff --git a/openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh b/openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh new file mode 100644 index 000000000..85b25959f --- /dev/null +++ b/openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +if [[ -f ./.env ]]; then + if grep -q 'WEBSITE_DIR' ./.env; then + echo "WEBSITE_DIR 参数已存在" + else + echo 'WEBSITE_DIR="./www"' >> ./.env + echo "已添加 WEBSITE_DIR=./www" + fi +else + echo ".env 文件不存在" +fi