diff --git a/nginx/replace_vars.sh b/nginx/replace_vars.sh index 4f294ef..510daf9 100755 --- a/nginx/replace_vars.sh +++ b/nginx/replace_vars.sh @@ -14,6 +14,7 @@ fi # 检查vhosts目录中是否有配置文件 if [ -z "$(ls -A vhosts/*.conf 2>/dev/null)" ]; then echo "警告: vhosts目录中没有.conf文件,没有配置文件需要处理" + exit 0 fi # 创建临时目录 @@ -47,14 +48,16 @@ for conf_file in vhosts/*.conf; do var_name=$(echo $var | cut -d= -f1) var_value=${!var_name} if [ ! -z "$var_value" ]; then - # 使用简单的变量替换方法 + # 使用更安全的变量替换方法 pattern="\\\${$var_name}" + # 转义特殊字符 + escaped_value=$(echo "$var_value" | sed 's/[\/&]/\\&/g') echo " 替换变量: ${pattern} -> $var_value" - content=$(echo "$content" | sed "s|${pattern}|$var_value|g") + content=$(echo "$content" | sed "s|${pattern}|${escaped_value}|g") fi done - # 写入处理后的内容到目标文件 + # 写入处理后的内容到临时文件 echo "$content" > "$TEMP_DIR/$filename" echo " 文件处理完成: $filename" diff --git a/nginx/vhosts/consul.conf b/nginx/vhosts/consul.conf index c948825..de3b93c 100644 --- a/nginx/vhosts/consul.conf +++ b/nginx/vhosts/consul.conf @@ -2,7 +2,7 @@ server { listen 80; listen 443 ssl; - server_name consul-bazhong.t-aaron.com; + server_name ${CONSUL_DOMAIN}; ssl_certificate /etc/nginx/t-aaron.com.pem; ssl_certificate_key /etc/nginx/t-aaron.com.key; @@ -12,7 +12,7 @@ server { ssl_prefer_server_ciphers on; location / { - proxy_pass http://CONSUL_bazhong:8500; + proxy_pass http://${CONSUL_NAME}:8500; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/vhosts/minio.conf b/nginx/vhosts/minio.conf index 4c8ce8c..b6aed3d 100644 --- a/nginx/vhosts/minio.conf +++ b/nginx/vhosts/minio.conf @@ -2,7 +2,7 @@ server { listen 80; listen 443 ssl; - server_name minio-bazhong.t-aaron.com; + server_name ${MINIO_DOMAIN}; ssl_certificate /etc/nginx/t-aaron.com.pem; ssl_certificate_key /etc/nginx/t-aaron.com.key; @@ -15,6 +15,6 @@ server { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://minio-bazhong.t-aaron.com:9000; + proxy_pass http://${MINIO_NAME}:9000; } } diff --git a/nginx/vhosts/minioconsole.conf b/nginx/vhosts/minioconsole.conf index a0b1eaf..5237eaa 100644 --- a/nginx/vhosts/minioconsole.conf +++ b/nginx/vhosts/minioconsole.conf @@ -2,7 +2,7 @@ server { listen 80; listen 443 ssl; - server_name minioconsole-bazhong.t-aaron.com; + server_name ${MINIO_CONSOLE_DOMAIN}; ssl_certificate /etc/nginx/t-aaron.com.pem; ssl_certificate_key /etc/nginx/t-aaron.com.key; @@ -15,6 +15,6 @@ server { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://minio-bazhong.t-aaron.com:9001; + proxy_pass http://${MINIO_NAME}:9001; } } diff --git a/nginx/vhosts/oidcservice.conf b/nginx/vhosts/oidcservice.conf index 15b222d..fc1d80b 100644 --- a/nginx/vhosts/oidcservice.conf +++ b/nginx/vhosts/oidcservice.conf @@ -13,7 +13,7 @@ location / { - proxy_pass http://OIDC_SERVER_bazhong:8090; + proxy_pass http://${OIDC_SERVER_NAME}:8090; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/vhosts/sky.conf b/nginx/vhosts/sky.conf index 7017a3a..d285800 100644 --- a/nginx/vhosts/sky.conf +++ b/nginx/vhosts/sky.conf @@ -12,7 +12,7 @@ ssl_prefer_server_ciphers on; location / { - proxy_pass http://SKYWALKING_UI_bazhong:8080; + proxy_pass http://${SKYWALKING_UI_NAME}:8080; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;