diff --git a/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf index db78b634d..df7a85891 100644 --- a/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test1/bots.d/whitelist-ips.conf @@ -26,4 +26,4 @@ # Only add actual IP addresses and ranges here 111.111.111.111 0; -35.188.141.55 0; +35.188.95.235 0; diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf index 60cb8be8c..6cb8074fe 100644 --- a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.10.934 -### Updated: Tue Oct 3 15:46:49 SAST 2017 +### Version: V3.2017.10.936 +### Updated: Tue Oct 3 16:12:19 SAST 2017 ### Bad Referrer Count: 5840 ### Bad Bot Count: 515 ################################################### diff --git a/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf index db78b634d..df7a85891 100644 --- a/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf @@ -26,4 +26,4 @@ # Only add actual IP addresses and ranges here 111.111.111.111 0; -35.188.141.55 0; +35.188.95.235 0; diff --git a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf index b20ed82c4..507605876 100644 --- a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.10.934 -### Updated: Tue Oct 3 15:46:49 SAST 2017 +### Version: V3.2017.10.936 +### Updated: Tue Oct 3 16:12:19 SAST 2017 ### Bad Referrer Count: 5840 ### Bad Bot Count: 515 ################################################### diff --git a/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf index db78b634d..df7a85891 100644 --- a/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test3/bots.d/whitelist-ips.conf @@ -26,4 +26,4 @@ # Only add actual IP addresses and ranges here 111.111.111.111 0; -35.188.141.55 0; +35.188.95.235 0; diff --git a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf index f65697163..cb34fca6d 100644 --- a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.10.934 -### Updated: Tue Oct 3 15:46:49 SAST 2017 +### Version: V3.2017.10.936 +### Updated: Tue Oct 3 16:12:19 SAST 2017 ### Bad Referrer Count: 5840 ### Bad Bot Count: 515 ################################################### diff --git a/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf b/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf index 8224c5546..df7a85891 100644 --- a/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test4/bots.d/whitelist-ips.conf @@ -26,4 +26,4 @@ # Only add actual IP addresses and ranges here 111.111.111.111 0; -35.188.66.27 0; +35.188.95.235 0; diff --git a/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf index 36465bb23..6cb8074fe 100644 --- a/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf +++ b/.dev-tools/_conf_files_test4/conf.d/globalblacklist.conf @@ -4,8 +4,8 @@ ### VERSION INFORMATION # ################################################### -### Version: V3.2017.10.924 -### Updated: Tue Oct 3 14:31:42 SAST 2017 +### Version: V3.2017.10.936 +### Updated: Tue Oct 3 16:12:19 SAST 2017 ### Bad Referrer Count: 5840 ### Bad Bot Count: 515 ################################################### @@ -118,7 +118,7 @@ map $http_user_agent $bad_bot { # START CUSTOM BLACKLISTED USER AGENTS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # *********************************************************************************** - include /etc/nginx/mybots.d/blacklist-user-agents.conf; + include /etc/nginx/bots.d/blacklist-user-agents.conf; # ********************************************************************************* # END CUSTOM BLACKLISTED USER AGENTS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -779,7 +779,7 @@ map $http_referer $bad_words { # START WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************ - include /etc/nginx/mybots.d/whitelist-domains.conf; + include /etc/nginx/bots.d/whitelist-domains.conf; # ********************************************************************** # END WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -790,7 +790,7 @@ map $http_referer $bad_words { # START CUSTOM BAD REFERRER WORDS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ****************************************************************************** - include /etc/nginx/mybots.d/bad-referrer-words.conf; + include /etc/nginx/bots.d/bad-referrer-words.conf; # **************************************************************************** # END CUSTOM BAD REFERRER WORDS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -836,7 +836,7 @@ map $http_referer $bad_words { # kill all your SEO in a week. # To add your own custom bad referrers use the custom include file -# /etc/nginx/mybots.d/custom-bad-referrers.conf +# /etc/nginx/bots.d/custom-bad-referrers.conf # Or send a Pull Request to add it to the global blacklist for other users. # In the bad referrers section I also include sites that hotlink images without permission. @@ -865,7 +865,7 @@ map $http_referer $bad_referer { # START WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************ - include /etc/nginx/mybots.d/whitelist-domains.conf; + include /etc/nginx/bots.d/whitelist-domains.conf; # ********************************************************************** # END WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -882,7 +882,7 @@ map $http_referer $bad_referer { # START CUSTOM BAD REFERRERS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************* - include /etc/nginx/mybots.d/custom-bad-referrers.conf; + include /etc/nginx/bots.d/custom-bad-referrers.conf; # *********************************************************************** # END CUSTOM BAD REFERRERS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6764,7 +6764,7 @@ geo $validate_client { # START WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************** - include /etc/nginx/mybots.d/whitelist-ips.conf; + include /etc/nginx/bots.d/whitelist-ips.conf; # ************************************************************************ # END WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6940,7 +6940,7 @@ geo $validate_client { # START BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ******************************************************************** - include /etc/nginx/mybots.d/blacklist-ips.conf; + include /etc/nginx/bots.d/blacklist-ips.conf; # ****************************************************************** # END BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6961,7 +6961,7 @@ geo $ratelimited { # START WHITELISTED IP RANGES2 ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # *************************************************************************** - include /etc/nginx/mybots.d/whitelist-ips.conf; + include /etc/nginx/bots.d/whitelist-ips.conf; # ************************************************************************* # END WHITELISTED IP RANGES2 ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### diff --git a/.dev-tools/_conf_files_test4/default.vhost b/.dev-tools/_conf_files_test4/default.vhost new file mode 100644 index 000000000..34ed06fd0 --- /dev/null +++ b/.dev-tools/_conf_files_test4/default.vhost @@ -0,0 +1,15 @@ +server { + # Bad Bot Blocker + include /etc/nginx/bots.d/ddos.conf; + include /etc/nginx/bots.d/blockbots.conf; + + listen *:9000; + + root /var/www/html; + server_name localhost; + charset UTF-8; + + location / { + root /var/www/html/; + } +} diff --git a/.dev-tools/_curl_tests/curltest1.txt b/.dev-tools/_curl_tests/curltest1.txt index 08c3b5b32..a3f6ceda5 100755 --- a/.dev-tools/_curl_tests/curltest1.txt +++ b/.dev-tools/_curl_tests/curltest1.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Oct 3 15:46:55 SAST 2017 +Last Tested: Tue Oct 3 16:12:25 SAST 2017 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest2.txt b/.dev-tools/_curl_tests/curltest2.txt index 08c3b5b32..a3f6ceda5 100755 --- a/.dev-tools/_curl_tests/curltest2.txt +++ b/.dev-tools/_curl_tests/curltest2.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Oct 3 15:46:55 SAST 2017 +Last Tested: Tue Oct 3 16:12:25 SAST 2017 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest3.txt b/.dev-tools/_curl_tests/curltest3.txt index 08c3b5b32..a3f6ceda5 100755 --- a/.dev-tools/_curl_tests/curltest3.txt +++ b/.dev-tools/_curl_tests/curltest3.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Oct 3 15:46:55 SAST 2017 +Last Tested: Tue Oct 3 16:12:25 SAST 2017 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest4.txt b/.dev-tools/_curl_tests/curltest4.txt index 08c3b5b32..a3f6ceda5 100755 --- a/.dev-tools/_curl_tests/curltest4.txt +++ b/.dev-tools/_curl_tests/curltest4.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Oct 3 15:46:55 SAST 2017 +Last Tested: Tue Oct 3 16:12:25 SAST 2017 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed diff --git a/.dev-tools/_curl_tests/curltest5.txt b/.dev-tools/_curl_tests/curltest5.txt index 75f2acdeb..d22acade8 100755 --- a/.dev-tools/_curl_tests/curltest5.txt +++ b/.dev-tools/_curl_tests/curltest5.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Oct 3 15:46:55 SAST 2017 +Last Tested: Tue Oct 3 16:12:25 SAST 2017