From aca52efae8208d2d6531a3501c382a81fb7e64d4 Mon Sep 17 00:00:00 2001 From: Camilla Date: Tue, 18 Mar 2025 18:07:01 +0100 Subject: [PATCH 1/9] nginx changes --- .github/workflows/update_primary_nginx.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml index c049176..c10dfa6 100644 --- a/.github/workflows/update_primary_nginx.yml +++ b/.github/workflows/update_primary_nginx.yml @@ -21,14 +21,11 @@ jobs: - name: Check environment variables run: env - - name: Echo - run: echo "this is a test" - #Doesn't work properly, envsubst replaces all instances of $variable and ${variable}, but we want to keep e.g., $host as nginx variables - name: Create temporary nginx config file run: envsubst '${PROD_PORT_PREFIX} ${DEV_PORT_PREFIX} ${STAG_PORT_PREFIX} ${GATEWAY_POSTFIX}' < ./nginx_template.txt > temp_default.conf # Maybe look at https://www.baeldung.com/linux/envsubst-command to get an idea - name: Copy temporary file to correct place - run: cp temp_default.conf nginx/nginx_securefit.conf + run: cp temp_default.conf /etc/nginx/conf.d/default.conf #run: cp nginx/nginx.conf /etc/nginx/conf.d/nginx_securefit.conf From 412228eba1d2c90ea8893d4632e7d2d5331c53c4 Mon Sep 17 00:00:00 2001 From: Camilla Date: Tue, 18 Mar 2025 18:24:32 +0100 Subject: [PATCH 2/9] help --- etc/slettmeg.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 etc/slettmeg.txt diff --git a/etc/slettmeg.txt b/etc/slettmeg.txt new file mode 100644 index 0000000..e69de29 From 29ede91eb98e5728f4356d4d7514581897f4fb3f Mon Sep 17 00:00:00 2001 From: Malene Lundemo Date: Tue, 18 Mar 2025 18:25:17 +0100 Subject: [PATCH 3/9] Delete etc/slettmeg.txt --- etc/slettmeg.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 etc/slettmeg.txt diff --git a/etc/slettmeg.txt b/etc/slettmeg.txt deleted file mode 100644 index e69de29..0000000 From 2a6c41f614b402fdd46e4b948eb3331f9bd8a1c3 Mon Sep 17 00:00:00 2001 From: Camilla Date: Tue, 18 Mar 2025 18:27:57 +0100 Subject: [PATCH 4/9] help --- etc/empty.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 etc/empty.txt diff --git a/etc/empty.txt b/etc/empty.txt new file mode 100644 index 0000000..e69de29 From 7d46551c6bbda66d727964e28b3a690148b949e7 Mon Sep 17 00:00:00 2001 From: Camilla Date: Tue, 18 Mar 2025 18:30:06 +0100 Subject: [PATCH 5/9] help --- .github/workflows/update_primary_nginx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml index c10dfa6..920d78c 100644 --- a/.github/workflows/update_primary_nginx.yml +++ b/.github/workflows/update_primary_nginx.yml @@ -27,5 +27,5 @@ jobs: # Maybe look at https://www.baeldung.com/linux/envsubst-command to get an idea - name: Copy temporary file to correct place - run: cp temp_default.conf /etc/nginx/conf.d/default.conf + run: cp temp_default.conf etc/nginx/conf.d/default.conf #run: cp nginx/nginx.conf /etc/nginx/conf.d/nginx_securefit.conf From 3c638b2c3e5c2456e6650016bdccf9128d9638b9 Mon Sep 17 00:00:00 2001 From: Malene Lundemo Date: Tue, 18 Mar 2025 18:35:34 +0100 Subject: [PATCH 6/9] Update update_primary_nginx.yml --- .github/workflows/update_primary_nginx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml index 920d78c..c96d332 100644 --- a/.github/workflows/update_primary_nginx.yml +++ b/.github/workflows/update_primary_nginx.yml @@ -27,5 +27,5 @@ jobs: # Maybe look at https://www.baeldung.com/linux/envsubst-command to get an idea - name: Copy temporary file to correct place - run: cp temp_default.conf etc/nginx/conf.d/default.conf + run: touch cp temp_default.conf /etc/nginx/conf.d/default.conf #run: cp nginx/nginx.conf /etc/nginx/conf.d/nginx_securefit.conf From 9cf84a8c77c9c519a51976e5ab55c4ff308cd81f Mon Sep 17 00:00:00 2001 From: Malene Lundemo Date: Tue, 18 Mar 2025 18:37:55 +0100 Subject: [PATCH 7/9] Update update_primary_nginx.yml --- .github/workflows/update_primary_nginx.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml index c96d332..c3f5d91 100644 --- a/.github/workflows/update_primary_nginx.yml +++ b/.github/workflows/update_primary_nginx.yml @@ -25,7 +25,10 @@ jobs: - name: Create temporary nginx config file run: envsubst '${PROD_PORT_PREFIX} ${DEV_PORT_PREFIX} ${STAG_PORT_PREFIX} ${GATEWAY_POSTFIX}' < ./nginx_template.txt > temp_default.conf # Maybe look at https://www.baeldung.com/linux/envsubst-command to get an idea - + + - name: Make dir + run: mkdir /etc/nginx/conf.d + - name: Copy temporary file to correct place - run: touch cp temp_default.conf /etc/nginx/conf.d/default.conf + run: cp temp_default.conf /etc/nginx/conf.d/default.conf #run: cp nginx/nginx.conf /etc/nginx/conf.d/nginx_securefit.conf From 206d03b620872fdd27fbfb062d49f0d2fc63bf13 Mon Sep 17 00:00:00 2001 From: Malene Lundemo Date: Tue, 18 Mar 2025 18:39:31 +0100 Subject: [PATCH 8/9] Delete etc directory --- etc/empty.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 etc/empty.txt diff --git a/etc/empty.txt b/etc/empty.txt deleted file mode 100644 index e69de29..0000000 From a954343fcbf5818d272ff98bfb769b0743f70a03 Mon Sep 17 00:00:00 2001 From: Malene Lundemo Date: Tue, 18 Mar 2025 18:49:22 +0100 Subject: [PATCH 9/9] Update update_primary_nginx.yml --- .github/workflows/update_primary_nginx.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/update_primary_nginx.yml b/.github/workflows/update_primary_nginx.yml index c3f5d91..4286e65 100644 --- a/.github/workflows/update_primary_nginx.yml +++ b/.github/workflows/update_primary_nginx.yml @@ -25,9 +25,6 @@ jobs: - name: Create temporary nginx config file run: envsubst '${PROD_PORT_PREFIX} ${DEV_PORT_PREFIX} ${STAG_PORT_PREFIX} ${GATEWAY_POSTFIX}' < ./nginx_template.txt > temp_default.conf # Maybe look at https://www.baeldung.com/linux/envsubst-command to get an idea - - - name: Make dir - run: mkdir /etc/nginx/conf.d - name: Copy temporary file to correct place run: cp temp_default.conf /etc/nginx/conf.d/default.conf