From 092f2747b52dd6005927469fcf979bdc4cabcac0 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Fri, 7 Jul 2017 17:13:01 +0200 Subject: [PATCH] Change ordering of commands in install-nginx.sh --- travisCI/install-nginx.sh | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/travisCI/install-nginx.sh b/travisCI/install-nginx.sh index 7be120d0e..19c1de2fe 100755 --- a/travisCI/install-nginx.sh +++ b/travisCI/install-nginx.sh @@ -36,6 +36,26 @@ # ************************************************* sudo rm /etc/nginx/sites-available/default +sudo rm /etc/nginx/sites-enabled/default +sudo rm /var/www/html/* + +# ******************************************************** +# Copy our default.vhost file into Nginx /sites-available/ +# ******************************************************** + +sudo cp $TRAVIS_BUILD_DIR/travisCI/default.vhost /etc/nginx/sites-available/default.vhost + +# ********************************************** +# Link the vhost file into Nginx /sites-enabled/ +# ********************************************** + +sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default.vhost + +# *********************************************************** +# Copy our index.php file into the default site's root folder +# *********************************************************** + +sudo cp $TRAVIS_BUILD_DIR/travisCI/index.php /var/www/html/index.php # *********************************************************************** # Download the Nginx Bad Bot Blocker setup files from the Live Repository @@ -60,18 +80,6 @@ sudo chmod +x /usr/sbin/update-ngxblocker cd /usr/sbin sudo ./install-ngxblocker -x -# ******************************************************** -# Copy our default.vhost file into Nginx /sites-available/ -# ******************************************************** - -sudo cp $TRAVIS_BUILD_DIR/travisCI/default.vhost /etc/nginx/sites-available/default.vhost - -# ********************************************** -# Link the vhost file into Nginx /sites-enabled/ -# ********************************************** - -sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default.vhost - # ******************** # Run setup-ngxblocker # ******************** @@ -91,12 +99,6 @@ sudo ./setup-ngxblocker -x sudo nginx -c /etc/nginx/nginx.conf -# *********************************************************** -# Copy our index.php file into the default site's root folder -# *********************************************************** - -sudo cp $TRAVIS_BUILD_DIR/travisCI/index.php /var/www/html/index.php - # **************************************************************************************** # Run update-ngxblocker test which downloads latest globalblacklist.conf and reloads Nginx # ****************************************************************************************