From c1b26cd4cde8fbcf0bf7370c77fb0042a90b1ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 15 May 2025 13:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nginx/replace_vars.sh           | 20 ++++++++++++--------
 nginx/temp_vhosts/sky.conf      |  2 +-
 nginx/temp_vhosts/upstream.conf |  1 +
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nginx/replace_vars.sh b/nginx/replace_vars.sh
index 8a15b71..e08d90f 100755
--- a/nginx/replace_vars.sh
+++ b/nginx/replace_vars.sh
@@ -26,22 +26,26 @@ for conf_file in vhosts/*.conf; do
     filename=$(basename "$conf_file")
     echo "处理文件: $filename"
     
-    # 复制原始文件到临时目录
-    cp "$conf_file" "$TEMP_DIR/$filename"
+    # 读取原始文件内容
+    content=$(cat "$conf_file")
     
     # 获取environment.sh中所有环境变量
     env_vars=$(grep -E "^export [A-Z_]+" ../environment.sh | sed 's/export //')
     
-    # 使用envsubst命令替换变量(同时兼容Linux和Mac)
-    # 创建环境变量列表用于envsubst
-    env_list=""
+    # 逐个替换环境变量
     for var in $env_vars; do
         var_name=$(echo $var | cut -d= -f1)
-        env_list="$env_list \${$var_name}"
+        var_value=${!var_name}
+        if [ ! -z "$var_value" ]; then
+            # 使用简单的变量替换方法
+            pattern="\\\${$var_name}"
+            echo "  替换变量: ${pattern} -> $var_value"
+            content=$(echo "$content" | sed "s|${pattern}|$var_value|g")
+        fi
     done
     
-    # 使用envsubst进行替换
-    cat "$conf_file" | envsubst "$env_list" > "$TEMP_DIR/$filename"
+    # 写入处理后的内容到目标文件
+    echo "$content" > "$TEMP_DIR/$filename"
     
     echo "  文件处理完成: $filename"
 done
diff --git a/nginx/temp_vhosts/sky.conf b/nginx/temp_vhosts/sky.conf
index 8d471bf..1c3171e 100644
--- a/nginx/temp_vhosts/sky.conf
+++ b/nginx/temp_vhosts/sky.conf
@@ -1,7 +1,7 @@
     server {
        listen 80;
        listen 443 ssl;
-       server_name sky-bazhong.t-aaron.com1;
+       server_name sky-bazhong.t-aaron.com;
 
         # SSL证书配置
         ssl_certificate /etc/nginx/t-aaron.com.pem;
diff --git a/nginx/temp_vhosts/upstream.conf b/nginx/temp_vhosts/upstream.conf
index e69de29..8b13789 100644
--- a/nginx/temp_vhosts/upstream.conf
+++ b/nginx/temp_vhosts/upstream.conf
@@ -0,0 +1 @@
+