Minor formatting fixes on Nginx Tests 1,2 and 3

This commit is contained in:
Mitchell Krog 2017-08-27 11:32:46 +02:00
parent 879e6ff02a
commit 3e906b6d2e
No known key found for this signature in database
GPG key ID: 2BB9A077C8DD6994
3 changed files with 10 additions and 7 deletions

View file

@ -43,18 +43,20 @@
# Start Getting Nginx Ready for Testing the Nginx Bad Bot Blocker
# ***************************************************************
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' "###################################" "STARTING NGINX TEST 1" "###################################"
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

View file

@ -47,7 +47,7 @@
# Make Sure We Cleanup From Nginx Test 1
# **************************************
printf '\n%s\n%s\n%s\n\n' "###################################" "STARTING NGINX TEST 2" "###################################"
printf '\n%s\n%s\n%s\n\n' "###################################" " STARTING NGINX TEST 2" "###################################"
printf '\n%s\n%s\n%s\n\n' "###################################" "Cleaning up Files from Nginx Test 1" "###################################"
sudo rm /etc/nginx/sites-available/default.vhost
sudo rm /etc/nginx/sites-enabled/default.vhost
@ -234,7 +234,7 @@ sudo cp $TRAVIS_BUILD_DIR/conf.d/globalblacklist.conf /usr/local/nginx/conf.d/gl
# Run setup-ngxblocker Again
# **************************
printf '\n%s\n%s\n%s\n\n' "####################" "Run setup-ngxblocker to fix includes in globalblacklist.conf" "####################"
printf '\n%s\n%s\n%s\n\n' "############################################################" "Run setup-ngxblocker to fix includes in globalblacklist.conf" "############################################################"
cd /usr/sbin
sudo bash ./setup-ngxblocker -x -c /usr/local/nginx/conf.d -b /usr/local/nginx/bots.d

View file

@ -47,7 +47,7 @@
# Make Sure We Cleanup From Nginx Test 2
# **************************************
printf '\n%s\n%s\n%s\n\n' "###################################" "STARTING NGINX TEST 3" "###################################"
printf '\n%s\n%s\n%s\n\n' "###################################" " STARTING NGINX TEST 3" "###################################"
printf '\n%s\n%s\n%s\n\n' "###################################" "Cleaning up Files from Nginx Test 2" "###################################"
sudo rm /etc/nginx/sites-available/default.vhost
sudo rm /etc/nginx/sites-enabled/default.vhost
@ -60,15 +60,16 @@ printf '\n%s\n%s\n%s\n\n' "########################################" "Cleaning u
# Restore backup of the clean and default nginx.conf file
# ******************************************************
printf '\n%s\n%s\n%s\n\n' "#################################" "Restoring Default nginx.conf file" "#################################"
sudo cp $TRAVIS_BUILD_DIR/.dev-tools/_nginx_conf_backup/nginx.conf /etc/nginx/nginx.conf
# *************************************
# List Directories to Confirm Deletions
# *************************************
printf '\n%s\n%s\n%s\n\n' "################################################" "Confirming /usr/local/nginx/conf.d/ directory is EMPTY" "################################################"
printf '\n%s\n%s\n%s\n\n' "######################################################" "Confirming /usr/local/nginx/conf.d/ directory is EMPTY" "######################################################"
ls -la /usr/local/nginx/conf.d/
printf '\n%s\n%s\n%s\n\n' "################################################" "Confirming /usr/local/nginx/bots.d/ directory is EMPTY" "################################################"
printf '\n%s\n%s\n%s\n\n' "######################################################" "Confirming /usr/local/nginx/bots.d/ directory is EMPTY" "######################################################"
ls -la /usr/local/nginx/bots.d/
printf '\n%s\n%s\n%s\n\n' "#########################################################" "Confirming /etc/nginx/sites-available/ directory is EMPTY" "#########################################################"
ls -la /etc/nginx/sites-available/
@ -240,7 +241,7 @@ sudo cp $TRAVIS_BUILD_DIR/conf.d/globalblacklist.conf /etc/nginx/myconf.d/global
# Run setup-ngxblocker Again
# **************************
printf '\n%s\n%s\n%s\n\n' "####################" "Run setup-ngxblocker to fix includes in globalblacklist.conf" "####################"
printf '\n%s\n%s\n%s\n\n' "############################################################" "Run setup-ngxblocker to fix includes in globalblacklist.conf" "############################################################"
cd /usr/sbin
sudo bash ./setup-ngxblocker -x -c /etc/nginx/myconf.d -b /etc/nginx/mybots.d