From 608ae06e63f0329a4d70e85787f948e9c08cecdf Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Sun, 4 Jul 2021 16:15:01 +0200 Subject: [PATCH] Update GHA workflow [skip travis] --- dev-tools/install-nginx-1.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-tools/install-nginx-1.sh b/dev-tools/install-nginx-1.sh index 0fd39a247..f8ac8790c 100755 --- a/dev-tools/install-nginx-1.sh +++ b/dev-tools/install-nginx-1.sh @@ -105,7 +105,8 @@ printf "\n" echo "${bold}${yellow}-------------------------------------------" echo "${bold}${yellow}Delete any default files installed by Nginx" echo "${bold}${yellow}-------------------------------------------" -sudo rm /etc/nginx/sites-available/* +#sudo rm /etc/nginx/sites-available/* +sudo mv /etc/nginx/sites-available/default /etc/nginx/sites-available/default.vhost sudo rm /etc/nginx/sites-enabled/* sudo rm /var/www/html/* printf "\n" @@ -113,8 +114,8 @@ echo "${bold}${yellow}---------------------" echo "${bold}${yellow}Setup Vhost for Nginx" echo "${bold}${yellow}---------------------" #sudo rm /etc/nginx/sites-available/default -sudo cp ./dev-tools/default.vhost /etc/nginx/sites-available/default -sudo ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default +#sudo cp ./dev-tools/default.vhost /etc/nginx/sites-available/default.vhost +sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default sudo cp ./dev-tools/index.html /var/www/html/index.html } @@ -145,7 +146,7 @@ printf "\n" echo "${bold}${magenta}------------------------" echo "${bold}${magenta}Execute setup-ngxblocker" echo "${bold}${magenta}------------------------" -sudo bash /usr/sbin/setup-ngxblocker -i /usr/sbin/install-ngxblocker -x -e "" +sudo bash /usr/sbin/setup-ngxblocker -i /usr/sbin/install-ngxblocker -x } runsetupngxblocker2 () { @@ -153,7 +154,7 @@ printf "\n" echo "${bold}${magenta}------------------------" echo "${bold}${magenta}Execute setup-ngxblocker" echo "${bold}${magenta}------------------------" -sudo bash /usr/sbin/setup-ngxblocker -x -e "" +sudo bash /usr/sbin/setup-ngxblocker -x } loadNginxConf () {