From d7656e775e6ab02d24e85526b1128548a5a75b00 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Wed, 28 Aug 2024 16:12:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20openresty=20?= =?UTF-8?q?=E6=8C=82=E8=BD=BD=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openresty/1.25.3.2-0-1-focal/conf/nginx.conf | 1 + openresty/1.25.3.2-0-1-focal/data.yml | 6 +++--- openresty/1.25.3.2-0-1-focal/docker-compose.yml | 3 ++- openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh | 12 ------------ 4 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh diff --git a/openresty/1.25.3.2-0-1-focal/conf/nginx.conf b/openresty/1.25.3.2-0-1-focal/conf/nginx.conf index 4a5f3673e..356e4f2ee 100644 --- a/openresty/1.25.3.2-0-1-focal/conf/nginx.conf +++ b/openresty/1.25.3.2-0-1-focal/conf/nginx.conf @@ -39,5 +39,6 @@ http { limit_conn_zone $server_name zone=perserver:10m; include /usr/local/openresty/nginx/conf/conf.d/*.conf; + include /usr/local/openresty/nginx/conf/default/*.conf; include /usr/local/openresty/1pwaf/data/conf/waf.conf; } \ No newline at end of file diff --git a/openresty/1.25.3.2-0-1-focal/data.yml b/openresty/1.25.3.2-0-1-focal/data.yml index 53e3651d8..933be702a 100755 --- a/openresty/1.25.3.2-0-1-focal/data.yml +++ b/openresty/1.25.3.2-0-1-focal/data.yml @@ -31,9 +31,9 @@ additionalProperties: - default: www envKey: WEBSITE_DIR labelEn: Website Dir - labelZh: 网站目录(网站目录会放置在 1Panel 安装目录下) + labelZh: 网站目录(默认网站目录会放置在 1Panel 安装目录下，如需修改请以绝对路径填写) required: true - type: string + type: text label: en: Website directory (The website directory will be placed under the 1Panel installation directory) ja: ウェブサイトディレクトリ（ウェブサイトディレクトリは 1Panel インストールディレクトリに配置されます） @@ -41,5 +41,5 @@ additionalProperties: 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 安装目录下） + zh: 网站目录(默认网站目录会放置在 1Panel 安装目录下，如需修改请以绝对路径填写) diff --git a/openresty/1.25.3.2-0-1-focal/docker-compose.yml b/openresty/1.25.3.2-0-1-focal/docker-compose.yml index 1e76420d0..550414c79 100644 --- a/openresty/1.25.3.2-0-1-focal/docker-compose.yml +++ b/openresty/1.25.3.2-0-1-focal/docker-compose.yml @@ -10,10 +10,11 @@ services: - ./conf/fastcgi-php.conf:/usr/local/openresty/nginx/conf/fastcgi-php.conf - ./conf/mime.types:/usr/local/openresty/nginx/conf/mime.types - ./log:/var/log/nginx - - ./conf/conf.d:/usr/local/openresty/nginx/conf/conf.d/ - ${WEBSITE_DIR}:/www + - ${WEBSITE_DIR}/conf.d:/usr/local/openresty/nginx/conf/conf.d/ - ./root:/usr/share/nginx/html - /etc/localtime:/etc/localtime - ./1pwaf/data:/usr/local/openresty/1pwaf/data + - ./conf/conf.d:/usr/local/openresty/nginx/conf/default/ labels: createdBy: "Apps" 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 deleted file mode 100644 index 85b25959f..000000000 --- a/openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/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