From e8b7f3033535f2af16c488b3c1f940b6d74a65a3 Mon Sep 17 00:00:00 2001
From: Jonathan Inge Arvesen Folland <jifollan@stud.ntnu.no>
Date: Thu, 20 Mar 2025 19:56:20 +0100
Subject: [PATCH] Update update_primary_nginx.yml

---
 .github/workflows/update_primary_nginx.yml | 43 +++++++---------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml
index 7a3a739..4c6c258 100644
--- a/.github/workflows/update_primary_nginx.yml
+++ b/.github/workflows/update_primary_nginx.yml
@@ -1,4 +1,4 @@
-name: Setup nginx from the configuration file
+name: Setup Nginx Configuration
 
 on:
   workflow_dispatch:
@@ -11,41 +11,26 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Load environment variables
+      - name: Dotenv Action
         uses: falti/dotenv-action@v1.1.4
         with:
-          env-file: .env  # Path to your .env file
           export-variables: true
           keys-case: bypass
 
       - name: Check environment variables
         run: env
 
-      - name: Replace environment variables in nginx config
-        run: |
-          # Escape special characters in environment variables
-          URL_PREFIX_ESCAPED=$(echo "$URL_PREFIX" | sed 's/\//\\\//g')
-          
-          # Use sed with | as the delimiter to avoid issues with /
-          sed -e "s|\$GROUP_ID|$GROUP_ID|g" \
-              -e "s|\$DOMAIN|$DOMAIN|g" \
-              -e "s|\$URL_PREFIX|$URL_PREFIX_ESCAPED|g" \
-              -e "s|\$PORT_PREFIX|$PORT_PREFIX|g" \
-              -e "s|\$DEV_POSTFIX|$DEV_POSTFIX|g" \
-              -e "s|\$STAG_POSTFIX|$STAG_POSTFIX|g" \
-              -e "s|\$PROD_POSTFIX|$PROD_POSTFIX|g" \
-              -e "s|\$BACKEND_POSTFIX|$BACKEND_POSTFIX|g" \
-              -e "s|\$FRONTEND_POSTFIX|$FRONTEND_POSTFIX|g" \
-              -e "s|\$GATEWAY_POSTFIX|$GATEWAY_POSTFIX|g" \
-              nginx/nginx_securefit.conf > temp_nginx.conf
-
-      - name: Copy nginx config to correct place
-        run: |
-          sudo cp temp_nginx.conf /etc/nginx/conf.d/nginx_securefit.conf
-          sudo chmod 644 /etc/nginx/conf.d/nginx_securefit.conf  # Ensure correct permissions
-
-      - name: Restart nginx
-        run: sudo systemctl reload nginx
+      - name: Create temporary Nginx config file
+        run: envsubst '${PROD_PORT_PREFIX} ${DEV_PORT_PREFIX} ${STAG_PORT_PREFIX} ${GATEWAY_POSTFIX}' < nginx_template.txt > temp_nginx.conf
+
+      - name: Copy Nginx Configuration to Server
+        run: sudo cp temp_nginx.conf /etc/nginx/conf.d/nginx_securefit.conf
 
-      - name: Show nginx file
+      - name: Show Nginx Configuration
         run: cat /etc/nginx/conf.d/nginx_securefit.conf
+
+      - name: Restart Nginx
+        run: sudo systemctl reload nginx
+
+      - name: Verify Nginx Configuration
+        run: sudo nginx -t