feat: 修改 openresty 挂载目录

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;
 }

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 安装目录下，如需修改请以绝对路径填写)
 

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"

openresty/1.25.3.2-0-1-focal/scripts/upgrade.sh

@@ -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