vikarti.anatra/nginx-ultimate-bad-bot-blocker
1
0
Fork 0
mirror of https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git synced 2025-09-03 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dev-tools/_conf_files_test1/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_conf_files_test1/bots.d/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_conf_files_test1/conf.d/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_conf_files_test2/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_conf_files_test2/bots.d/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_conf_files_test2/conf.d/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_curl_tests/.keep Normal file
View file

@ -0,0 +1 @@
null

1
.dev-tools/_curl_tests_2/.keep Normal file
View file

@ -0,0 +1 @@
null

6
.dev-tools/_curl_tests_2/curltest1.txt Executable file
View file

@ -0,0 +1,6 @@
Last Tested: Tue Jul 25 12:04:18 SAST 2017
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (52) Empty reply from server

6
.dev-tools/_curl_tests_2/curltest2.txt Executable file
View file

@ -0,0 +1,6 @@
Last Tested: Tue Jul 25 12:04:18 SAST 2017
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (52) Empty reply from server

6
.dev-tools/_curl_tests_2/curltest3.txt Executable file
View file

@ -0,0 +1,6 @@
Last Tested: Tue Jul 25 12:04:18 SAST 2017
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (52) Empty reply from server

6
.dev-tools/_curl_tests_2/curltest4.txt Executable file
View file

@ -0,0 +1,6 @@
Last Tested: Tue Jul 25 12:04:18 SAST 2017
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (52) Empty reply from server

7
.dev-tools/_curl_tests_2/curltest5.txt Executable file
View file

@ -0,0 +1,7 @@
Last Tested: Tue Jul 25 12:04:18 SAST 2017
<?php
echo "Welcome to Nginx\n";
echo "This is the Travis Testing Environment for the Nginx Ultimate Bad Bot Blocker\n";
echo "Visit https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker\n";

7
.dev-tools/_curl_tests_2/curltest6.txt Executable file
View file

@ -0,0 +1,7 @@
Last Tested: Tue Jul 25 12:04:18 SAST 2017
<?php
echo "Welcome to Nginx\n";
echo "This is the Travis Testing Environment for the Nginx Ultimate Bad Bot Blocker\n";
echo "Visit https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker\n";

14
.dev-tools/install-nginx-2.sh
View file

@ -86,14 +86,14 @@ sudo mkdir /usr/local/nginx/bots.d
# ********************** # **********************
cd /usr/sbin 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 # Run setup-ngxblocker
# ******************** # ********************
cd /usr/sbin 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 # Load our Nginx.conf file
@ -106,7 +106,7 @@ sudo nginx -c /etc/nginx/nginx.conf
# **************************************************************************************** # ****************************************************************************************
cd /usr/sbin 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 # Force reload of Nginx
@ -114,6 +114,14 @@ sudo ./update-ngxblocker -b /usr/local/bots.d -e mitchellkrog@gmail.com
sudo service nginx reload 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 # Travis now moves into running the rest of the tests in the script: section of .travis.yml
# ***************************************************************************************** # *****************************************************************************************

7
.dev-tools/install-nginx.sh
View file

@ -129,6 +129,13 @@ sudo chmod +x $TRAVIS_BUILD_DIR/.dev-tools/run-curl-tests2.sh
sudo chmod +x $TRAVIS_BUILD_DIR/.dev-tools/prepare-robots-input.sh sudo chmod +x $TRAVIS_BUILD_DIR/.dev-tools/prepare-robots-input.sh
sudo chmod +x $TRAVIS_BUILD_DIR/.dev-tools/install-nginx-2.sh sudo chmod +x $TRAVIS_BUILD_DIR/.dev-tools/install-nginx-2.sh
# ************************************************************
# Copy all .conf files used in Test 1 to a folder for checking
# ************************************************************
cp /etc/nginx/bots.d/* $TRAVIS_BUILD_DIR/.dev-tools/_conf_files_test1/bots.d/
cp /etc/nginx/conf.d/* $TRAVIS_BUILD_DIR/.dev-tools/_conf_files_test1/conf.d/
# ***************************************************************************************** # *****************************************************************************************
# Travis now moves into running the rest of the tests in the script: section of .travis.yml # Travis now moves into running the rest of the tests in the script: section of .travis.yml
# ***************************************************************************************** # *****************************************************************************************

12
.dev-tools/run-curl-tests-2.sh
View file

@ -8,12 +8,12 @@
# Set Location of our Curl Test Results Files # Set Location of our Curl Test Results Files
# ******************************************* # *******************************************
_curltest1=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest1.txt _curltest1=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest1.txt
_curltest2=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest2.txt _curltest2=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest2.txt
_curltest3=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest3.txt _curltest3=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest3.txt
_curltest4=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest4.txt _curltest4=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest4.txt
_curltest5=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest5.txt _curltest5=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest5.txt
_curltest6=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest6.txt _curltest6=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest6.txt
_now="$(date)" _now="$(date)"
# ************************************************* # *************************************************