diff --git a/.dev-tools/blacklist-user-agents.conf b/.dev-tools/blacklist-user-agents.conf index 298abeef0..34706b41e 100644 --- a/.dev-tools/blacklist-user-agents.conf +++ b/.dev-tools/blacklist-user-agents.conf @@ -59,5 +59,4 @@ # "~*\bsome\-very\-bad\-useragentname2\b" 3; "~*(?:\b)Nutch(?:\b|)" 0; - "~*\bNutch\b" 0; diff --git a/.dev-tools/test-blocker-whitelist.sh b/.dev-tools/test-blocker-whitelist.sh index 588b54e84..92cf0d3f0 100755 --- a/.dev-tools/test-blocker-whitelist.sh +++ b/.dev-tools/test-blocker-whitelist.sh @@ -19,9 +19,9 @@ echo "Whitelist Tests Starting" echo "Activating User Whitelist/Blacklist" -#sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/blacklist-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf +sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/blacklist-user-agents.conf /etc/nginx/bots.d/blacklist-user-agents.conf echo "Reloading Nginx" -#sudo nginx -t && sudo nginx -s reload +sudo nginx -t && sudo nginx -s reload # ******************************************************* @@ -31,7 +31,7 @@ echo "Reloading Nginx" run_curltest1 () { printf '\n%s\n%s\n%s\n\n' "#########################" "TESTING USER WHITELIST" "#########################" if curl -v -A "Nutch" http://localhost:9000/index.php 2>&1 | grep -i 'Welcome'; then - echo "$(tput setaf 2)BAD BOT ALLOWED - TEST PASSED" + echo "$(tput setaf 2)WHITELISTING OF BAD BOT ALLOWED - TEST PASSED" else echo "$(tput setaf 1)WHITELISTING FAILED - TEST FAILED" #exit 1 diff --git a/.travis.yml b/.travis.yml index f1ab130be..979a72471 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ script: #- bash .dev-tools/test-blocker-whitelist.sh - bash .dev-tools/install-nginx-testing-of-changes.sh - bash .dev-tools/test-blocker.sh - #- bash .dev-tools/test-blocker-whitelist.sh + - bash .dev-tools/test-blocker-whitelist.sh #- bash .dev-tools/install-nginx-2.sh #- bash .dev-tools/test-blocker.sh #- bash .dev-tools/install-nginx-3.sh