diff --git a/deploy.sh b/deploy.sh index 21f8d9d..95a2afd 100755 --- a/deploy.sh +++ b/deploy.sh @@ -99,17 +99,17 @@ else # Create a simpler nginx config for local deployment echo "Generating local nginx configuration..." - cat > nginx/app.conf << EOF + cat > nginx/app.conf << 'EOF' server { listen 80; server_name localhost; location / { proxy_pass http://web:8000; - proxy_set_header Host \$host; - proxy_set_header X-Real-IP \$remote_addr; - proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto \$scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; } } EOF diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh index 4f4ee29..c347a7c 100755 --- a/init-letsencrypt.sh +++ b/init-letsencrypt.sh @@ -93,8 +93,11 @@ EOF header "Configuring Nginx" echo "Generating Nginx configuration..." -export DOMAIN_NAME=$domains -envsubst < ./nginx/app.conf.template > ./nginx/app.conf +# Use sed instead of envsubst to only replace DOMAIN_NAME without affecting nginx variables +cp ./nginx/app.conf.template ./nginx/app.conf +sed -i "s/\${DOMAIN_NAME}/$domains/g" ./nginx/app.conf + +echo "Generated nginx configuration for domain: $domains" # Stop any existing services echo "Stopping any existing services..." diff --git a/nginx/app.conf.template b/nginx/app.conf.template index e0316a9..94eb290 100644 --- a/nginx/app.conf.template +++ b/nginx/app.conf.template @@ -7,7 +7,7 @@ server { } location / { - return 301 https://$$host$$request_uri; + return 301 https://$host$request_uri; } } @@ -23,9 +23,9 @@ server { location / { proxy_pass http://web:8000; - proxy_set_header Host $$host; - proxy_set_header X-Real-IP $$remote_addr; - proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $$scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; } }