From a0fcbfe67fc33e3ef9cf4bf2df5448c1b65f96c8 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Thu, 6 Apr 2023 16:23:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20openresty=20=E6=9B=B4=E6=96=B0=E5=88=B0?= =?UTF-8?q?=201.21.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../versions/{1.21.4 => 1.21.4.1}/README.md | 0 .../conf/conf.d/00.default.conf | 0 .../conf/conf.d/default.conf | 0 .../versions/1.21.4.1/conf/fastcgi-php.conf | 13 ++++++++++ .../versions/1.21.4.1/conf/fastcgi_params | 24 +++++++++++++++++++ .../{1.21.4 => 1.21.4.1}/conf/nginx.conf | 0 .../versions/{1.21.4 => 1.21.4.1}/config.json | 0 .../{1.21.4 => 1.21.4.1}/docker-compose.yml | 2 ++ .../{1.21.4 => 1.21.4.1}/root/404.html | 0 .../{1.21.4 => 1.21.4.1}/root/index.html | 0 .../{1.21.4 => 1.21.4.1}/root/stop/index.html | 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/html | 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 24 files changed, 39 insertions(+) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/README.md (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/conf/conf.d/00.default.conf (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/conf/conf.d/default.conf (100%) create mode 100644 apps/openresty/versions/1.21.4.1/conf/fastcgi-php.conf create mode 100644 apps/openresty/versions/1.21.4.1/conf/fastcgi_params rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/conf/nginx.conf (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/config.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/docker-compose.yml (74%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/root/404.html (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/root/index.html (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/root/stop/index.html (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/access.lua (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/init.lua (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/args_check.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/cc.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/cookie_block.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/file_ext_block.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/html (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/ip_block.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/ip_white.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/post_check.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/url_block.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/url_white.json (100%) rename apps/openresty/versions/{1.21.4 => 1.21.4.1}/www/common/waf/rules/user_agent.json (100%) diff --git a/apps/openresty/versions/1.21.4/README.md b/apps/openresty/versions/1.21.4.1/README.md similarity index 100% rename from apps/openresty/versions/1.21.4/README.md rename to apps/openresty/versions/1.21.4.1/README.md diff --git a/apps/openresty/versions/1.21.4/conf/conf.d/00.default.conf b/apps/openresty/versions/1.21.4.1/conf/conf.d/00.default.conf similarity index 100% rename from apps/openresty/versions/1.21.4/conf/conf.d/00.default.conf rename to apps/openresty/versions/1.21.4.1/conf/conf.d/00.default.conf diff --git a/apps/openresty/versions/1.21.4/conf/conf.d/default.conf b/apps/openresty/versions/1.21.4.1/conf/conf.d/default.conf similarity index 100% rename from apps/openresty/versions/1.21.4/conf/conf.d/default.conf rename to apps/openresty/versions/1.21.4.1/conf/conf.d/default.conf diff --git a/apps/openresty/versions/1.21.4.1/conf/fastcgi-php.conf b/apps/openresty/versions/1.21.4.1/conf/fastcgi-php.conf new file mode 100644 index 000000000..0f3d134d0 --- /dev/null +++ b/apps/openresty/versions/1.21.4.1/conf/fastcgi-php.conf @@ -0,0 +1,13 @@ +# regex to split $uri to $fastcgi_script_name and $fastcgi_path +fastcgi_split_path_info ^(.+\.php)(/.+)$; + +# Check that the PHP script exists before passing it +try_files $fastcgi_script_name =404; + +# Bypass the fact that try_files resets $fastcgi_path_info +# see: http://trac.nginx.org/nginx/ticket/321 +set $path_info $fastcgi_path_info; +#fastcgi_param PATH_INFO $path_info; +fastcgi_read_timeout 3600; + +fastcgi_index index.php; diff --git a/apps/openresty/versions/1.21.4.1/conf/fastcgi_params b/apps/openresty/versions/1.21.4.1/conf/fastcgi_params new file mode 100644 index 000000000..0aa378e6b --- /dev/null +++ b/apps/openresty/versions/1.21.4.1/conf/fastcgi_params @@ -0,0 +1,24 @@ +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; \ No newline at end of file diff --git a/apps/openresty/versions/1.21.4/conf/nginx.conf b/apps/openresty/versions/1.21.4.1/conf/nginx.conf similarity index 100% rename from apps/openresty/versions/1.21.4/conf/nginx.conf rename to apps/openresty/versions/1.21.4.1/conf/nginx.conf diff --git a/apps/openresty/versions/1.21.4/config.json b/apps/openresty/versions/1.21.4.1/config.json similarity index 100% rename from apps/openresty/versions/1.21.4/config.json rename to apps/openresty/versions/1.21.4.1/config.json diff --git a/apps/openresty/versions/1.21.4/docker-compose.yml b/apps/openresty/versions/1.21.4.1/docker-compose.yml similarity index 74% rename from apps/openresty/versions/1.21.4/docker-compose.yml rename to apps/openresty/versions/1.21.4.1/docker-compose.yml index 5582ff482..a48b88573 100644 --- a/apps/openresty/versions/1.21.4/docker-compose.yml +++ b/apps/openresty/versions/1.21.4.1/docker-compose.yml @@ -7,6 +7,8 @@ services: network_mode: host volumes: - ./conf/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf + - ./conf/fastcgi_params:/usr/local/openresty/nginx/conf/fastcgi_params + - ./conf/fastcgi-php.conf:/usr/local/openresty/nginx/conf/fastcgi-php.conf - ./log:/var/log/nginx - ./conf/conf.d:/usr/local/openresty/nginx/conf/conf.d/ - ./www:/www diff --git a/apps/openresty/versions/1.21.4/root/404.html b/apps/openresty/versions/1.21.4.1/root/404.html similarity index 100% rename from apps/openresty/versions/1.21.4/root/404.html rename to apps/openresty/versions/1.21.4.1/root/404.html diff --git a/apps/openresty/versions/1.21.4/root/index.html b/apps/openresty/versions/1.21.4.1/root/index.html similarity index 100% rename from apps/openresty/versions/1.21.4/root/index.html rename to apps/openresty/versions/1.21.4.1/root/index.html diff --git a/apps/openresty/versions/1.21.4/root/stop/index.html b/apps/openresty/versions/1.21.4.1/root/stop/index.html similarity index 100% rename from apps/openresty/versions/1.21.4/root/stop/index.html rename to apps/openresty/versions/1.21.4.1/root/stop/index.html diff --git a/apps/openresty/versions/1.21.4/www/common/waf/access.lua b/apps/openresty/versions/1.21.4.1/www/common/waf/access.lua similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/access.lua rename to apps/openresty/versions/1.21.4.1/www/common/waf/access.lua diff --git a/apps/openresty/versions/1.21.4/www/common/waf/init.lua b/apps/openresty/versions/1.21.4.1/www/common/waf/init.lua similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/init.lua rename to apps/openresty/versions/1.21.4.1/www/common/waf/init.lua diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/args_check.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/args_check.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/args_check.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/args_check.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/cc.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/cc.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/cc.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/cc.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/cookie_block.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/cookie_block.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/cookie_block.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/cookie_block.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/file_ext_block.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/file_ext_block.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/file_ext_block.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/file_ext_block.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/html b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/html similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/html rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/html diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/ip_block.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/ip_block.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/ip_block.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/ip_block.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/ip_white.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/ip_white.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/ip_white.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/ip_white.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/post_check.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/post_check.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/post_check.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/post_check.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/url_block.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/url_block.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/url_block.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/url_block.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/url_white.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/url_white.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/url_white.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/url_white.json diff --git a/apps/openresty/versions/1.21.4/www/common/waf/rules/user_agent.json b/apps/openresty/versions/1.21.4.1/www/common/waf/rules/user_agent.json similarity index 100% rename from apps/openresty/versions/1.21.4/www/common/waf/rules/user_agent.json rename to apps/openresty/versions/1.21.4.1/www/common/waf/rules/user_agent.json