diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template index b589de3f4..d4aa92563 100644 --- a/.dev-tools/globalblacklist-testing.template +++ b/.dev-tools/globalblacklist-testing.template @@ -10,8 +10,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2019.06.1621 -### Updated: Wed Jun 26 11:37:07 SAST 2019 +### Version: V3.2019.06.1611 +### Updated: Wed Jun 26 09:35:19 SAST 2019 ### Bad Referrer Count: 6713 ### Bad Bot Count: 556 ################################################### @@ -10631,7 +10631,7 @@ geo $ratelimited { # this rate limiting will only take effect if you change any of the bots and change # their block value from 1 to 2. limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m; - limit_req_zone $bot_iplimit zone=bot2_reqlimitip:16m rate=6r/m burst=1; + limit_req_zone $bot_iplimit zone=bot2_reqlimitip:16m rate=2r/s; ### *** MAKE SURE TO ADD to your nginx.conf *** ### server_names_hash_bucket_size 64; diff --git a/.dev-tools/test-blocker-badwords.sh b/.dev-tools/test-blocker-badwords.sh index c1955b7b1..1bd616c79 100755 --- a/.dev-tools/test-blocker-badwords.sh +++ b/.dev-tools/test-blocker-badwords.sh @@ -48,10 +48,10 @@ sudo nginx -t && sudo nginx -s reload echo "${bold}${yellow}-----------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" -sleep 30s +sleep 10s # ******************************************************* # Function Curl Test 1 - Test User Whitelist for "Nutch" diff --git a/.dev-tools/test-blocker-quick.sh b/.dev-tools/test-blocker-quick.sh index fee265607..b7255db86 100755 --- a/.dev-tools/test-blocker-quick.sh +++ b/.dev-tools/test-blocker-quick.sh @@ -47,10 +47,10 @@ printf "\n\n" sudo nginx -t && sudo nginx -s reload echo "${bold}${yellow}-----------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" -sleep 30s +sleep 10s echo "${bold}${green}--------------" echo "${bold}${green}Tests Starting" diff --git a/.dev-tools/test-blocker-whitelist-domains.sh b/.dev-tools/test-blocker-whitelist-domains.sh index bd6756b96..2f3dfc080 100755 --- a/.dev-tools/test-blocker-whitelist-domains.sh +++ b/.dev-tools/test-blocker-whitelist-domains.sh @@ -48,10 +48,10 @@ sudo nginx -t && sudo nginx -s reload echo "${bold}${yellow}-----------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" -sleep 30s +sleep 10s # ************************************************* # Function Curl Test 1 - Test User Domain Whitelist diff --git a/.dev-tools/test-blocker-whitelist-ips.sh b/.dev-tools/test-blocker-whitelist-ips.sh index ae019cede..6e4a939bc 100755 --- a/.dev-tools/test-blocker-whitelist-ips.sh +++ b/.dev-tools/test-blocker-whitelist-ips.sh @@ -46,6 +46,7 @@ printf "\n\n" sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf printf '%s\t%s\n' "${thisip}" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf +printf '%s\t%s\n' "127.0.0.1" "1;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/blacklist-ips.conf /etc/nginx/bots.d/blacklist-ips.conf echo "${bold}${green}--------------------" @@ -55,6 +56,7 @@ printf "\n\n" sudo truncate -s 0 ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf printf '%s\t%s\n' "${thisip}" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf +printf '%s\t%s\n' "127.0.0.1" "0;" >> ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/whitelist-ips.conf /etc/nginx/bots.d/whitelist-ips.conf echo "${bold}${green}---------------" @@ -65,10 +67,10 @@ sudo nginx -t && sudo nginx -s reload echo "${bold}${yellow}-----------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" -#sleep 30s +sleep 10s # ************************************************* # Function Curl Test 1 - Test User Domain Whitelist diff --git a/.dev-tools/test-blocker-whitelist.sh b/.dev-tools/test-blocker-whitelist.sh index 29b7015e9..fd5b369be 100755 --- a/.dev-tools/test-blocker-whitelist.sh +++ b/.dev-tools/test-blocker-whitelist.sh @@ -134,7 +134,7 @@ sudo nginx -t && sudo nginx -s reload echo "${bold}${yellow}-----------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" sleep 10s diff --git a/.dev-tools/test-blocker.sh b/.dev-tools/test-blocker.sh index 7c911aa23..400fb0a7f 100755 --- a/.dev-tools/test-blocker.sh +++ b/.dev-tools/test-blocker.sh @@ -59,10 +59,10 @@ printf "\n\n" sudo nginx -t && sudo nginx -s reload echo "${bold}${yellow}-----------------------------------------------------------------------" -echo "${bold}${yellow}Sleeping for 30 seconds to allow Nginx to Properly Reload inside Travis" +echo "${bold}${yellow}Sleeping for 10 seconds to allow Nginx to Properly Reload inside Travis" echo "${bold}${yellow}-----------------------------------------------------------------------" printf "\n\n" -sleep 30s +sleep 10s echo "${bold}${green}--------------" echo "${bold}${green}Tests Starting"