From 2492238dcd7ea6425b012621e13c9db9b1307d6c Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 27 Jul 2017 13:46:09 +0200 Subject: [PATCH] Final Run of New Travis Tests (now uses only install-ngblocker) --- .dev-tools/install-nginx-1.sh | 4 ++++ .dev-tools/install-nginx-2.sh | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.dev-tools/install-nginx-1.sh b/.dev-tools/install-nginx-1.sh index dafeacb2f..de9cda8d9 100755 --- a/.dev-tools/install-nginx-1.sh +++ b/.dev-tools/install-nginx-1.sh @@ -122,7 +122,9 @@ sudo rm /etc/nginx/bots.d/*.conf # List Directories to Confirm Deletions # ************************************* +echo "Confirming /etc/nginx/conf.d/ directory is EMPTY" ls -la /etc/nginx/conf.d/ +echo "Confirming /etc/nginx/bots.d/ directory is EMPTY" ls -la /etc/nginx/bots.d/ # ********************************************************************************************************* @@ -136,7 +138,9 @@ sudo bash ./update-ngxblocker -n # List Directories to Confirm Downloaded Missing Files # **************************************************** +echo "Confirming /etc/nginx/conf.d/ directory has missing files replaced by update-ngxblocker" ls -la /etc/nginx/conf.d/ +echo "Confirming /etc/nginx/bots.d/ directory has missing files replaced by update-ngxblocker" ls -la /etc/nginx/bots.d/ # **************************************************************************************** diff --git a/.dev-tools/install-nginx-2.sh b/.dev-tools/install-nginx-2.sh index a39c79ebd..96d1dab69 100755 --- a/.dev-tools/install-nginx-2.sh +++ b/.dev-tools/install-nginx-2.sh @@ -50,10 +50,15 @@ sudo rm /etc/nginx/bots.d/*.conf # List Directories to Confirm Deletions # ************************************* +echo "Confirming /etc/nginx/conf.d/ directory is EMPTY" ls -la /etc/nginx/conf.d/ +echo "Confirming /etc/nginx/bots.d/ directory is EMPTY" ls -la /etc/nginx/bots.d/ +echo "Confirming /etc/nginx/sites-available/ directory is EMPTY" ls -la /etc/nginx/sites-available/ +echo "Confirming /etc/nginx/sites-enabled/ directory is EMPTY" ls -la /etc/nginx/sites-enabled/ +echo "Confirming /var/www/html/ directory is EMPTY" ls -la /var/www/html/ # ******************************************************** @@ -153,7 +158,9 @@ sudo rm /usr/local/nginx/bots.d/*.conf # List Directories to Confirm Deletions # ************************************* +echo "Confirming /usr/local/nginx/conf.d/ directory is EMPTY" ls -la /usr/local/nginx/conf.d/ +echo "Confirming /usr/local/nginx/bots.d/ directory is EMPTY" ls -la /usr/local/nginx/bots.d/ # ********************************************************************************************************* @@ -167,7 +174,9 @@ sudo bash ./update-ngxblocker -c /usr/local/nginx/conf.d -b /usr/local/nginx/bot # List Directories to Confirm Downloaded Missing Files # **************************************************** +echo "Confirming /usr/local/nginx/conf.d/ directory has missing files replaced by update-ngxblocker" ls -la /usr/local/nginx/conf.d/ +echo "Confirming /usr/local/nginx/bots.d/ directory has missing files replaced by update-ngxblocker" ls -la /usr/local/nginx/bots.d/ # **************************************************************************************** @@ -189,7 +198,6 @@ sudo bash ./update-ngxblocker -c /usr/local/nginx/conf.d -b /usr/local/nginx/bot sudo service nginx reload - # ************************************************************ # Copy all .conf files used in Test 2 to a folder for checking # ************************************************************ @@ -197,7 +205,6 @@ sudo service nginx reload 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 # *****************************************************************************************