diff --git a/.dev-tools/install-nginx-1.sh b/.dev-tools/install-nginx-1.sh index e455a02ca..f09017510 100755 --- a/.dev-tools/install-nginx-1.sh +++ b/.dev-tools/install-nginx-1.sh @@ -235,6 +235,7 @@ printf '\n%s\n%s\n%s\n\n' "######################" "Now Run our Curl Tests" "### sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/bots.d/ sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/conf.d/ sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/default.vhost +sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test1/nginx.conf # ***************************************************************************************** # Travis now moves into running the rest of the tests in the script: section of .travis.yml diff --git a/.dev-tools/install-nginx-2.sh b/.dev-tools/install-nginx-2.sh index fee268cd2..02e45805d 100755 --- a/.dev-tools/install-nginx-2.sh +++ b/.dev-tools/install-nginx-2.sh @@ -258,6 +258,7 @@ printf '\n%s\n%s\n%s\n\n' "######################" "Now Run our Curl Tests" "### sudo cp /usr/local/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test2/bots.d/ sudo cp /usr/local/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test2/conf.d/ sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test2/default.vhost +sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test2/nginx.conf # ***************************************************************************************** # Travis now moves into running the rest of the tests in the script: section of .travis.yml diff --git a/.dev-tools/install-nginx-3.sh b/.dev-tools/install-nginx-3.sh index 93c811c4c..9b73eef46 100755 --- a/.dev-tools/install-nginx-3.sh +++ b/.dev-tools/install-nginx-3.sh @@ -267,6 +267,7 @@ sudo chown -R travis:travis ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test3/ sudo cp /etc/nginx/mybots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test3/bots.d/ sudo cp /etc/nginx/myconf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test3/conf.d/ sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test3/default.vhost +sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test3/nginx.conf # ***************************************************************************************** # Travis now moves into running the rest of the tests in the script: section of .travis.yml diff --git a/.dev-tools/install-nginx-4.sh b/.dev-tools/install-nginx-4.sh index ac7d8c55e..d519fa90b 100755 --- a/.dev-tools/install-nginx-4.sh +++ b/.dev-tools/install-nginx-4.sh @@ -301,6 +301,7 @@ sudo chown -R travis:travis ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test4/ sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test4/bots.d/ sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test4/conf.d/ sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test4/default.vhost +sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_test4/nginx.conf ls -la /etc/nginx/sites-available/ ls -la /var/www/ sudo chown -R travis:travis ${TRAVIS_BUILD_DIR}/ diff --git a/.dev-tools/install-nginx-testing-of-changes.sh b/.dev-tools/install-nginx-testing-of-changes.sh index 832301dc9..00318ef44 100644 --- a/.dev-tools/install-nginx-testing-of-changes.sh +++ b/.dev-tools/install-nginx-testing-of-changes.sh @@ -68,7 +68,7 @@ printf '\n%s\n%s\n%s\n\n' "######################" "Now Run our Curl Tests" "### sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/bots.d/ sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/conf.d/ sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/default.vhost - +sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_testing_changes/nginx.conf # ********************** # Exit With Error Number diff --git a/.dev-tools/run-curl-tests-testing-of-changes.sh b/.dev-tools/run-curl-tests-testing-of-changes.sh index 26703e91e..7427abecd 100644 --- a/.dev-tools/run-curl-tests-testing-of-changes.sh +++ b/.dev-tools/run-curl-tests-testing-of-changes.sh @@ -50,6 +50,8 @@ else #exit 1 fi } +run_curltest1 + # ************************************************** # Function Curl Test 2 - Check for Bad Bot "Nutch" @@ -67,6 +69,8 @@ else #exit 1 fi } +run_curltest2 + # ****************************************************************** # Function Curl Test 3 - Check for Bad Referrer "100dollars-seo.com" @@ -84,6 +88,8 @@ else #exit 1 fi } +run_curltest3 + # ****************************************************** # Function Curl Test 4 - Check for Bad Referrer "zx6.ru" @@ -101,6 +107,7 @@ else #exit 1 fi } +run_curltest4 # ***************************************************** # Function Curl Test 5 - Check for Good Bot "GoogleBot" @@ -118,6 +125,7 @@ else #exit 1 fi } +run_curltest5 # *************************************************** # Function Curl Test 6 - Check for Good Bot "BingBot" @@ -135,6 +143,7 @@ else #exit 1 fi } +run_curltest6 # *********************************************************** # Function Curl Test 7 - Check for Good Referrer "google.com" @@ -152,6 +161,7 @@ else #exit 1 fi } +run_curltest7 # *********************************************************** # Function Curl Test 8 - Check for Good Referrer "bing.com" @@ -170,6 +180,7 @@ else #exit 1 fi } +run_curltest8 # ************************************************** # Function Curl Test 9 - Check for Bad Bot "Nutch" @@ -187,6 +198,7 @@ else #exit 1 fi } +run_curltest9 # ************************************************** # Function Curl Test 10 - Check for Bad Bot "Nutch" @@ -204,31 +216,12 @@ else #exit 1 fi } +run_curltest10 # ********************************* # Trigger our curl functions to run # ********************************* -echo "Test 1" -run_curltest1 -echo "Test 2" -run_curltest2 -echo "Test 3" -run_curltest3 -echo "Test 4" -run_curltest4 -echo "Test 5" -run_curltest5 -echo "Test 6" -run_curltest6 -echo "Test 6" -run_curltest7 -echo "Test 8" -run_curltest8 -echo "Test 9" -run_curltest9 -echo "Test 10" -run_curltest10 echo "Tests Completed"