From e90fb4ff9d3dfa8df055e67252be216f1d6b8dff Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Tue, 25 Jul 2017 12:14:24 +0200
Subject: [PATCH] Run second Travis Test again (uses non standard nginx folder
 locations for .conf files)

---
 .dev-tools/_conf_files_test1/.keep        |  1 +
 .dev-tools/_conf_files_test1/bots.d/.keep |  1 +
 .dev-tools/_conf_files_test1/conf.d/.keep |  1 +
 .dev-tools/_conf_files_test2/.keep        |  1 +
 .dev-tools/_conf_files_test2/bots.d/.keep |  1 +
 .dev-tools/_conf_files_test2/conf.d/.keep |  1 +
 .dev-tools/_curl_tests/.keep              |  1 +
 .dev-tools/_curl_tests_2/.keep            |  1 +
 .dev-tools/_curl_tests_2/curltest1.txt    |  6 ++++++
 .dev-tools/_curl_tests_2/curltest2.txt    |  6 ++++++
 .dev-tools/_curl_tests_2/curltest3.txt    |  6 ++++++
 .dev-tools/_curl_tests_2/curltest4.txt    |  6 ++++++
 .dev-tools/_curl_tests_2/curltest5.txt    |  7 +++++++
 .dev-tools/_curl_tests_2/curltest6.txt    |  7 +++++++
 .dev-tools/install-nginx-2.sh             | 14 +++++++++++---
 .dev-tools/install-nginx.sh               |  7 +++++++
 .dev-tools/run-curl-tests-2.sh            | 12 ++++++------
 17 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 .dev-tools/_conf_files_test1/.keep
 create mode 100644 .dev-tools/_conf_files_test1/bots.d/.keep
 create mode 100644 .dev-tools/_conf_files_test1/conf.d/.keep
 create mode 100644 .dev-tools/_conf_files_test2/.keep
 create mode 100644 .dev-tools/_conf_files_test2/bots.d/.keep
 create mode 100644 .dev-tools/_conf_files_test2/conf.d/.keep
 create mode 100644 .dev-tools/_curl_tests/.keep
 create mode 100644 .dev-tools/_curl_tests_2/.keep
 create mode 100755 .dev-tools/_curl_tests_2/curltest1.txt
 create mode 100755 .dev-tools/_curl_tests_2/curltest2.txt
 create mode 100755 .dev-tools/_curl_tests_2/curltest3.txt
 create mode 100755 .dev-tools/_curl_tests_2/curltest4.txt
 create mode 100755 .dev-tools/_curl_tests_2/curltest5.txt
 create mode 100755 .dev-tools/_curl_tests_2/curltest6.txt

diff --git a/.dev-tools/_conf_files_test1/.keep b/.dev-tools/_conf_files_test1/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_conf_files_test1/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_conf_files_test1/bots.d/.keep b/.dev-tools/_conf_files_test1/bots.d/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_conf_files_test1/bots.d/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_conf_files_test1/conf.d/.keep b/.dev-tools/_conf_files_test1/conf.d/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_conf_files_test1/conf.d/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_conf_files_test2/.keep b/.dev-tools/_conf_files_test2/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_conf_files_test2/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_conf_files_test2/bots.d/.keep b/.dev-tools/_conf_files_test2/bots.d/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_conf_files_test2/bots.d/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_conf_files_test2/conf.d/.keep b/.dev-tools/_conf_files_test2/conf.d/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_conf_files_test2/conf.d/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_curl_tests/.keep b/.dev-tools/_curl_tests/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_curl_tests/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_curl_tests_2/.keep b/.dev-tools/_curl_tests_2/.keep
new file mode 100644
index 000000000..ec747fa47
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/.keep
@@ -0,0 +1 @@
+null
\ No newline at end of file
diff --git a/.dev-tools/_curl_tests_2/curltest1.txt b/.dev-tools/_curl_tests_2/curltest1.txt
new file mode 100755
index 000000000..9c04ee667
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/curltest1.txt
@@ -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
diff --git a/.dev-tools/_curl_tests_2/curltest2.txt b/.dev-tools/_curl_tests_2/curltest2.txt
new file mode 100755
index 000000000..9c04ee667
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/curltest2.txt
@@ -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
diff --git a/.dev-tools/_curl_tests_2/curltest3.txt b/.dev-tools/_curl_tests_2/curltest3.txt
new file mode 100755
index 000000000..9c04ee667
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/curltest3.txt
@@ -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
diff --git a/.dev-tools/_curl_tests_2/curltest4.txt b/.dev-tools/_curl_tests_2/curltest4.txt
new file mode 100755
index 000000000..9c04ee667
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/curltest4.txt
@@ -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
diff --git a/.dev-tools/_curl_tests_2/curltest5.txt b/.dev-tools/_curl_tests_2/curltest5.txt
new file mode 100755
index 000000000..4c2afa3d3
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/curltest5.txt
@@ -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";
\ No newline at end of file
diff --git a/.dev-tools/_curl_tests_2/curltest6.txt b/.dev-tools/_curl_tests_2/curltest6.txt
new file mode 100755
index 000000000..4c2afa3d3
--- /dev/null
+++ b/.dev-tools/_curl_tests_2/curltest6.txt
@@ -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";
\ No newline at end of file
diff --git a/.dev-tools/install-nginx-2.sh b/.dev-tools/install-nginx-2.sh
index 7b9635f29..5b1ffa625 100755
--- a/.dev-tools/install-nginx-2.sh
+++ b/.dev-tools/install-nginx-2.sh
@@ -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
 # *****************************************************************************************
diff --git a/.dev-tools/install-nginx.sh b/.dev-tools/install-nginx.sh
index bbaa94ecf..c4914d1fe 100755
--- a/.dev-tools/install-nginx.sh
+++ b/.dev-tools/install-nginx.sh
@@ -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/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
 # *****************************************************************************************
diff --git a/.dev-tools/run-curl-tests-2.sh b/.dev-tools/run-curl-tests-2.sh
index 42b61cff9..da6f1e922 100755
--- a/.dev-tools/run-curl-tests-2.sh
+++ b/.dev-tools/run-curl-tests-2.sh
@@ -8,12 +8,12 @@
 # Set Location of our Curl Test Results Files
 # *******************************************
 
-_curltest1=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest1.txt
-_curltest2=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest2.txt
-_curltest3=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest3.txt
-_curltest4=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest4.txt
-_curltest5=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest5.txt
-_curltest6=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests/curltest6.txt
+_curltest1=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest1.txt
+_curltest2=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest2.txt
+_curltest3=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest3.txt
+_curltest4=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest4.txt
+_curltest5=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest5.txt
+_curltest6=$TRAVIS_BUILD_DIR/.dev-tools/_curl_tests_2/curltest6.txt
 _now="$(date)"
 
 # *************************************************