diff --git a/.dev-tools/install-nginx-4.sh b/.dev-tools/install-nginx-4.sh index c62e7c461..f25608061 100755 --- a/.dev-tools/install-nginx-4.sh +++ b/.dev-tools/install-nginx-4.sh @@ -56,62 +56,34 @@ sudo rm /etc/nginx/nginx.conf ls -la /etc/nginx/ sudo cp $TRAVIS_BUILD_DIR/.dev-tools/_nginx_conf_backup/nginx13.conf /etc/nginx/nginx.conf ls -la /etc/nginx/ +sudo apt-get purge nginx-full +sudo apt-get purge nginx-common +sudo apt-get purge nginx* # ***************************** # Lets Install Mainstream Nginx # ***************************** -sudo apt-get purge nginx-full -sudo apt-get purge nginx-common -sudo apt-get purge nginx* - mainstreamnginx=development sudo add-apt-repository -y ppa:nginx/$mainstreamnginx sudo apt-get update sudo apt-get install -y --assume-yes nginx-full sudo nginx -V sudo nginx -t - -# Try fix starting the Nginx Service -printf '\n%s\n%s\n%s\n\n' "###################################" " FIX NGINX SERVICE ISSUES" "###################################" - -#sudo service nginx status - -sudo service nginx start sudo service nginx reload -#cat /etc/init/nginx.conf - -#systemctl status nginx.service -#systemctl enable nginx.service -#systemctl is-enabled nginx.service -#systemctl start nginx.service -#systemctl stop nginx.service -#systemctl restart nginx.service - - -#sudo /etc/init.d/nginx stop -#sudo service status nginx -#sudo /etc/init.d/nginx start -#sudo /etc/init.d/nginx reload -#sudo /etc/init.d/nginx restart -#sudo nginx -s reload -#ls -la /etc/nginx/ -#sudo service nginx restart -#sudo service nginx reload -#sudo systemctl enable nginx.service -#sudo systemctl status nginx.service -#sudo service nginx start -#sudo service --status-all -#ls -la /etc/init.d/ - -printf '\n%s\n%s\n%s\n\n' "###################################" " END NGINX SERVICE ISSUES" "###################################" - # ************************************** # Make Sure We Cleanup From Nginx Test 3 # ************************************** +printf '\n%s\n\n' "################################################################################################################" +printf '\n%s\n\n' "################################################################################################################" +printf '\n%s\n\n' "################################################################################################################" printf '\n%s\n%s\n%s\n\n' "###################################" " STARTING NGINX TEST 4" "###################################" +printf '\n%s\n\n' "################################################################################################################" +printf '\n%s\n\n' "################################################################################################################" +printf '\n%s\n\n\n\n\n\n' "################################################################################################################" + printf '\n%s\n%s\n%s\n\n' "###################################" "Cleaning up Files from Nginx Test 3" "###################################" sudo rm /etc/nginx/sites-available/default.vhost sudo rm /etc/nginx/sites-enabled/default.vhost diff --git a/.dev-tools/run-curl-tests-4.sh b/.dev-tools/run-curl-tests-4.sh index 58109e54c..28e2031ee 100755 --- a/.dev-tools/run-curl-tests-4.sh +++ b/.dev-tools/run-curl-tests-4.sh @@ -43,7 +43,7 @@ if grep -i '(52)' $_curltest1; then echo 'BAD BOT DETECTED - TEST PASSED' else echo 'BAD BOT NOT DETECTED - TEST FAILED' - #exit 1 + exit 1 fi } @@ -60,7 +60,7 @@ if grep -i '(52)' $_curltest2; then echo 'BAD BOT DETECTED - TEST PASSED' else echo 'BAD BOT NOT DETECTED - TEST FAILED' - #exit 1 + exit 1 fi } @@ -77,7 +77,7 @@ if grep -i '(52)' $_curltest3; then echo 'BAD REFERRER DETECTED - TEST PASSED' else echo 'BAD REFERRER NOT DETECTED - TEST FAILED' - #exit 1 + exit 1 fi } @@ -94,7 +94,7 @@ if grep -i '(52)' $_curltest4; then echo 'BAD REFERRER DETECTED - TEST PASSED' else echo 'BAD REFERRER NOT DETECTED - TEST FAILED' - #exit 1 + exit 1 fi } @@ -111,7 +111,7 @@ if grep -i 'Welcome' $_curltest5; then echo 'GOOD BOT ALLOWED THROUGH - TEST PASSED' else echo 'GOOD BOT NOT ALLOWED THROUGH - TEST FAILED' - #exit 1 + exit 1 fi } @@ -128,7 +128,7 @@ if grep -i 'Welcome' $_curltest6; then echo 'GOOD BOT ALLOWED THROUGH - TEST PASSED' else echo 'GOOD BOT NOT ALLOWED THROUGH - TEST FAILED' - #exit 1 + exit 1 fi } @@ -145,7 +145,7 @@ if grep -i 'Welcome' $_curltest7; then echo 'GOOD REFERRER DETECTED - TEST PASSED' else echo 'GOOD REFERRER NOT DETECTED - TEST FAILED' - #exit 1 + exit 1 fi } @@ -162,7 +162,7 @@ if grep -i 'Welcome' $_curltest8; then echo 'GOOD REFERRER DETECTED - TEST PASSED' else echo 'GOOD REFERRER NOT DETECTED - TEST FAILED' - #exit 1 + exit 1 fi }