From 7a72d65f0d51baed63f2fef283097c5e96dbb61a Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 20 Jun 2019 12:24:11 +0200 Subject: [PATCH] Fix nginx testing of test version --- .../install-nginx-testing-of-changes.sh | 186 +----------------- 1 file changed, 10 insertions(+), 176 deletions(-) diff --git a/.dev-tools/install-nginx-testing-of-changes.sh b/.dev-tools/install-nginx-testing-of-changes.sh index 7a135b3b5..7c10994c6 100644 --- a/.dev-tools/install-nginx-testing-of-changes.sh +++ b/.dev-tools/install-nginx-testing-of-changes.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Travis CI Generating and Building for the Nginx Ultimate Bad Bot Blocker +# Travis CI Generating and Building for the Nginx Ultimate Bad Bot Blocker (using non standard folder locations) # Created by: Mitchell Krog (mitchellkrog@gmail.com) # Copyright: Mitchell Krog - https://github.com/mitchellkrogza # Repo Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker @@ -39,178 +39,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# *************************************************************** -# Start Getting Nginx Ready for Testing the Nginx Bad Bot Blocker -# *************************************************************** +# Run testing of test version -printf '\n%s\n%s\n%s\n\n' "###################################" " STARTING NGINX TEST 1" "###################################" - -# ****************************************************** -# Make a backup of the clean and default nginx.conf file -# Needed to run Nginx test 3 -# ****************************************************** - -printf '\n%s\n%s\n%s\n\n' "###################################" "Making backup of default nginx.conf" "###################################" -sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_nginx_conf_backup/nginx.conf - -# ************************************************* -# Delete default site created by Nginx Installation -# ************************************************* - -printf '\n%s\n%s\n%s\n\n' "###########################################" "Delete any default files installed by Nginx" "###########################################" -sudo rm /etc/nginx/sites-available/default -sudo rm /etc/nginx/sites-enabled/default -sudo rm /var/www/html/* -printf '\n%s\n%s\n%s\n\n' "#######################################" "Nginx prepared for our Testing Sequence" "#######################################" - -# ******************************************************** -# Copy our default.vhost file into Nginx /sites-available/ -# ******************************************************** - -printf '\n%s\n%s\n%s\n\n' "################################" "Get Nginx Setup for Nginx Test 1" "################################" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/default.vhost /etc/nginx/sites-available/default.vhost - -# ********************************************** -# Link the vhost file into Nginx /sites-enabled/ -# ********************************************** - -sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default.vhost - -# *********************************************************** -# Copy our index.php file into the default site's root folder -# *********************************************************** - -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/index.php /var/www/html/index.php -printf '\n%s\n%s\n%s\n\n' "#####################################" "Finished Nginx Setup for Nginx Test 1" "#####################################" - -# *********************************************** -# Fetch our install-ngxblocker file from the repo -# *********************************************** - -printf '\n%s\n%s\n%s\n\n' "######################################" "Fetch install-ngxblocker from the repo" "######################################" -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/install-ngxblocker -O /usr/sbin/install-ngxblocker -sudo chmod +x /usr/sbin/install-ngxblocker - -# ********************** -# Run Install-NgxBlocker -# ********************** - -printf '\n%s\n%s\n%s\n\n' "######################" "Run install-ngxblocker" "######################" -cd /usr/sbin -sudo bash ./install-ngxblocker -s /usr/sbin/ -x - -# ************************************************** -# Set our install and setup scripts to be executable -# ************************************************** - -printf '\n%s\n%s\n%s\n\n' "##########################################################" "Set our install, setup and update scripts to be executable" "##########################################################" -sudo chmod +x /usr/sbin/install-ngxblocker -sudo chmod +x /usr/sbin/setup-ngxblocker -sudo chmod +x /usr/sbin/update-ngxblocker - -# ******************** -# Run setup-ngxblocker -# ******************** - -printf '\n%s\n%s\n%s\n\n' "####################" "Run setup-ngxblocker" "####################" -cd /usr/sbin -sudo bash ./setup-ngxblocker -i /usr/sbin/install-ngxblocker -x - -# ************************ -# Load our Nginx.conf file -# ************************ - -sudo nginx -c /etc/nginx/nginx.conf - -# **************************************************************************************** -# Copy a dummy version of globalblacklist.conf with an older version number to test update -# **************************************************************************************** - -printf '\n%s\n%s\n%s\n\n' "####################################################" "Copy older globalblacklist.conf file to force update" "####################################################" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/globalblacklist-dummy.conf /etc/nginx/conf.d/globalblacklist.conf - -# **************************************************************************************** -# Run update-ngxblocker test which downloads latest globalblacklist.conf and reloads Nginx -# **************************************************************************************** - -printf '\n%s\n%s\n%s\n\n' "######################" "Run update-ngxblocker" "######################" -cd /usr/sbin -sudo bash ./update-ngxblocker -n - -# ********************* -# Force reload of Nginx -# ********************* - -printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################" -sudo service nginx reload - -# ******************************************************************************************* -# Test that update-ngxblocker can install all missing required files by deleting some of them -# ******************************************************************************************* - -printf '\n%s\n%s\n%s\n\n' "####################################################################" "Delete existing files to force update-ngxblocker to re-download them" "####################################################################" -sudo rm /etc/nginx/conf.d/*.conf -sudo rm /etc/nginx/bots.d/*.conf - -# ************************************* -# List Directories to Confirm Deletions -# ************************************* - -printf '\n%s\n%s\n%s\n\n' "################################################" "Confirming /etc/nginx/conf.d/ directory is EMPTY" "################################################" -ls -la /etc/nginx/conf.d/ -printf '\n%s\n%s\n%s\n\n' "################################################" "Confirming /etc/nginx/bots.d/ directory is EMPTY" "################################################" -ls -la /etc/nginx/bots.d/ - -# ********************************************************************************************************* -# Run update-ngxblocker to test for missing files and download latest globalblacklist.conf and reload Nginx -# ********************************************************************************************************* - -printf '\n%s\n%s\n%s\n\n' "######################" "Run update-ngxblocker" "######################" -cd /usr/sbin -sudo bash ./update-ngxblocker -n - -# **************************************************** -# List Directories to Confirm Downloaded Missing Files -# **************************************************** - -printf '\n%s\n%s\n%s\n\n' "#######################################################################################" "Confirming /etc/nginx/conf.d/ directory has missing files replaced by update-ngxblocker" "#######################################################################################" -ls -la /etc/nginx/conf.d/ -printf '\n%s\n%s\n%s\n\n' "#######################################################################################" "Confirming /etc/nginx/bots.d/ directory has missing files replaced by update-ngxblocker" "#######################################################################################" -ls -la /etc/nginx/bots.d/ - -# **************************************************************************************** -# Copy a dummy version of globalblacklist.conf with an older version number to test update -# **************************************************************************************** - -printf '\n%s\n%s\n%s\n\n' "####################################################" "Copy older globalblacklist.conf file to force update" "####################################################" -sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/globalblacklist-dummy.conf /etc/nginx/conf.d/globalblacklist.conf - -# ********************************************************************************************************* -# Run update-ngxblocker to test for missing files and download latest globalblacklist.conf and reload Nginx -# ********************************************************************************************************* - -printf '\n%s\n%s\n%s\n\n' "######################" "Run update-ngxblocker" "######################" -cd /usr/sbin -sudo bash ./update-ngxblocker -n - -# ************************** -# Run setup-ngxblocker again -# ************************** - -printf '\n%s\n%s\n%s\n\n' "####################" "Run setup-ngxblocker" "####################" -cd /usr/sbin -sudo bash ./setup-ngxblocker -x - -# ********************* -# Force reload of Nginx -# ********************* - -printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################" -sudo service nginx reload - -# ******************************************************************* -# Make sure we test using out testing version of globalblacklist.conf -# ******************************************************************* +# ******************************************************* +# Make sure we test latest generated globalblacklist.conf +# ******************************************************* printf '\n%s\n%s\n%s\n\n' "##############################################################################" "Copy latest generated globalblacklist.conf file to test for any compile errors" "##############################################################################" sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/nginx/conf.d/globalblacklist.conf @@ -222,6 +55,9 @@ sudo cp ${TRAVIS_BUILD_DIR}/conf.d/globalblacklist-testing-version.conf /etc/ngi printf '\n%s\n%s\n%s\n\n' "########################" "Force Reloading of Nginx" "########################" sudo service nginx reload +sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/default13.vhost /etc/nginx/sites-available/default.vhost +sudo service nginx reload + # ********************** # Now Run our Curl Tests # ********************** @@ -229,15 +65,13 @@ sudo service nginx reload printf '\n%s\n%s\n%s\n\n' "######################" "Now Run our Curl Tests" "######################" # ************************************************************ -# Copy all .conf files used in Test 1 to a folder for checking +# Copy all .conf files used in Test 3 to a folder for checking # ************************************************************ 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 -# ***************************************************************************************** -# Travis now moves into running the rest of the tests in the script: section of .travis.yml -# ***************************************************************************************** # ********************** # Exit With Error Number