Change ordering of commands in install-nginx.sh

This commit is contained in:
Mitchell Krog 2017-07-07 17:13:01 +02:00
parent 86ed1c5227
commit 092f2747b5

View file

@ -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
# ****************************************************************************************