Run second Travis Test again (uses non standard nginx folder locations for .conf files)

This commit is contained in:
Mitchell Krog 2017-07-25 12:14:24 +02:00
parent a8cc4061d6
commit e90fb4ff9d
17 changed files with 70 additions and 9 deletions

View file

@ -86,14 +86,14 @@ sudo mkdir /usr/local/nginx/bots.d
# **********************
cd /usr/sbin
sudo ./install-ngxblocker -x -b /usr/local/bots.d -c /usr/local/nginx/conf.d
sudo ./install-ngxblocker -x -b /usr/local/nginx/bots.d -c /usr/local/nginx/conf.d
# ********************
# Run setup-ngxblocker
# ********************
cd /usr/sbin
sudo ./setup-ngxblocker -x -b /usr/local/bots.d -c /usr/local/nginx/conf.d
sudo ./setup-ngxblocker -x -b /usr/local/nginx/bots.d -c /usr/local/nginx/conf.d
# ************************
# Load our Nginx.conf file
@ -106,7 +106,7 @@ sudo nginx -c /etc/nginx/nginx.conf
# ****************************************************************************************
cd /usr/sbin
sudo ./update-ngxblocker -b /usr/local/bots.d -e mitchellkrog@gmail.com
sudo ./update-ngxblocker -b /usr/local/nginx/bots.d -e mitchellkrog@gmail.com
# *********************
# Force reload of Nginx
@ -114,6 +114,14 @@ sudo ./update-ngxblocker -b /usr/local/bots.d -e mitchellkrog@gmail.com
sudo service nginx reload
# ************************************************************
# Copy all .conf files used in Test 2 to a folder for checking
# ************************************************************
cp /usr/local/nginx/bots.d/* $TRAVIS_BUILD_DIR/.dev-tools/_conf_files_test2/bots.d/
cp /usr/local/nginx/conf.d/* $TRAVIS_BUILD_DIR/.dev-tools/_conf_files_test2/conf.d/
# *****************************************************************************************
# Travis now moves into running the rest of the tests in the script: section of .travis.yml
# *****************************************************************************************