From 07362bc9ad028dce38db72b8a535f29debe00004 Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Sun, 4 Jul 2021 15:50:26 +0200
Subject: [PATCH] Update GHA workflow [skip travis]

---
 .github/workflows/action.yml | 24 +++++++++---------------
 dev-tools/install-nginx-1.sh |  2 +-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 42e7e3f4b..edcbeede4 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -30,14 +30,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Install Nginx Stable
+      - name: Install Software
         run: |
-          cat /etc/nginx/sites-available/default
-          #sudo apt remove nginx
-          #sudo apt purge nginx
-          #sudo add-apt-repository -y ppa:nginx/stable
-          #sudo apt update
-          #sudo apt install -y --assume-yes nginx-extras
           sudo apt -y install dos2unix
 
 
@@ -46,8 +40,12 @@ jobs:
         run: |
           echo "export TERM=xterm" >> ~/.bashrc
           source ~/.bashrc
+          sudo systemctl enable nginx
+          sudo systemctl start nginx
+          sudo nginx -t
+          sudo systemctl reload nginx
           ./dev-tools/generate-files.sh
-          #./dev-tools/install-nginx-1.sh
+          ./dev-tools/install-nginx-1.sh
 
       - name: Debug
         shell: bash
@@ -55,13 +53,9 @@ jobs:
           sudo netstat -napt
           cat /etc/nginx/nginx.conf
           sudo systemctl list-units --type=service --all
-          sudo systemctl enable nginx
-          sudo systemctl list-units --type=service --all
-          sudo systemctl start nginx
-          sudo systemctl list-units --type=service --all
-          sudo nginx -t
-          sudo systemctl reload nginx
-          sudo systemctl list-units --type=service --all
+          #sudo systemctl list-units --type=service --all
+          #sudo systemctl list-units --type=service --all
+          #sudo systemctl list-units --type=service --all
           #sudo systemctl status nginx.service
           #sudo systemctl status nginx
         if: always()
diff --git a/dev-tools/install-nginx-1.sh b/dev-tools/install-nginx-1.sh
index 7d1fadfd1..7b89a942f 100755
--- a/dev-tools/install-nginx-1.sh
+++ b/dev-tools/install-nginx-1.sh
@@ -242,7 +242,7 @@ runsetupngxblocker1
 loadNginxConf
 forceUpdateTest1
 runupdatengxblocker
-startNginX
+#startNginX
 reloadNginX
 waitforReload
 forceUpdateTest2