Final test of second round of Nginx testing using non-standard folders before package is deployed.

- Disable debugging in .travis.yml
This commit is contained in:
Mitchell Krog 2017-07-25 12:41:55 +02:00
parent 0e440ada9a
commit 7fc40a7a85
3 changed files with 12 additions and 14 deletions

View file

@ -101,15 +101,13 @@ sudo ./setup-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/bots.d
sudo nginx -c /etc/nginx/nginx.conf
# ****************************************************************************************
# ******************************************************************************************
# Run update-ngxblocker test which downloads latest globalblacklist.conf and reloads Nginx
# ****************************************************************************************
# This second test forces update-ngxblocker to re-write the Include location to non standard
# location of /usr/local/nginx/bots.d
# ******************************************************************************************
cd /usr/sbin
# First delete the globalblacklist.conf file so that the update actually pulls a new file
#sudo rm /usr/local/nginx/conf.d/globalblacklist.conf
sudo ./update-ngxblocker -c /usr/local/nginx/conf.d -b /usr/local/nginx/bots.d -e mitchellkrog@gmail.com
# *********************

View file

@ -28,7 +28,7 @@ if grep -i '(52)' $_curltest1; then
echo 'BAD BOT DETECTED - TEST PASSED'
else
echo 'BAD BOT NOT DETECTED - TEST FAILED'
#exit 1
exit 1
fi
}
@ -44,7 +44,7 @@ if grep -i '(52)' $_curltest2; then
echo 'BAD BOT DETECTED - TEST PASSED'
else
echo 'BAD BOT NOT DETECTED - TEST FAILED'
#exit 1
exit 1
fi
}
@ -60,7 +60,7 @@ if grep -i '(52)' $_curltest3; then
echo 'BAD REFERRER DETECTED - TEST PASSED'
else
echo 'BAD REFERRER NOT DETECTED - TEST FAILED'
#exit 1
exit 1
fi
}
@ -76,7 +76,7 @@ if grep -i '(52)' $_curltest4; then
echo 'BAD REFERRER DETECTED - TEST PASSED'
else
echo 'BAD REFERRER NOT DETECTED - TEST FAILED'
#exit 1
exit 1
fi
}
@ -92,7 +92,7 @@ if grep -i 'Welcome' $_curltest5; then
echo 'GOOD BOT ALLOWED THROUGH - TEST PASSED'
else
echo 'GOOD BOT NOT ALLOWED THROUGH - TEST FAILED'
#exit 1
exit 1
fi
}
@ -108,7 +108,7 @@ if grep -i 'Welcome' $_curltest6; then
echo 'GOOD BOT ALLOWED THROUGH - TEST PASSED'
else
echo 'GOOD BOT NOT ALLOWED THROUGH - TEST FAILED'
#exit 1
exit 1
fi
}

View file

@ -34,9 +34,9 @@ install:
script:
- bash .dev-tools/install-nginx.sh
- bash .dev-tools/run-curl-tests.sh
- bash -x .dev-tools/install-nginx-2.sh
- bash .dev-tools/install-nginx-2.sh
- bash .dev-tools/run-curl-tests-2.sh
- bash -x .dev-tools/modify-files-and-commit.sh
- bash .dev-tools/modify-files-and-commit.sh
before_deploy:
- bash -x .dev-tools/deploy-package.sh