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 daeedbf01..f22a432b6 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.190.218 0; +35.184.89.15 0; diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf index fd2d693dc..9eb253608 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.09.873 -### Updated: Tue Sep 5 11:10:38 SAST 2017 +### Version: V3.2017.09.874 +### Updated: Tue Sep 5 11:20:15 SAST 2017 ### Bad Referrer Count: 5719 ### Bad Bot Count: 513 ################################################### 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 daeedbf01..f22a432b6 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.190.218 0; +35.184.89.15 0; diff --git a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf index 84317af55..0247a46e2 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.09.873 -### Updated: Tue Sep 5 11:10:38 SAST 2017 +### Version: V3.2017.09.874 +### Updated: Tue Sep 5 11:20:15 SAST 2017 ### Bad Referrer Count: 5719 ### Bad Bot Count: 513 ################################################### 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 daeedbf01..f22a432b6 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.190.218 0; +35.184.89.15 0; diff --git a/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test3/conf.d/globalblacklist.conf index 84317af55..255880e7a 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.09.873 -### Updated: Tue Sep 5 11:10:38 SAST 2017 +### Version: V3.2017.09.874 +### Updated: Tue Sep 5 11:20:15 SAST 2017 ### Bad Referrer Count: 5719 ### Bad Bot Count: 513 ################################################### @@ -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 /usr/local/nginx/bots.d/blacklist-user-agents.conf; + include /etc/nginx/mybots.d/blacklist-user-agents.conf; # ********************************************************************************* # END CUSTOM BLACKLISTED USER AGENTS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -777,7 +777,7 @@ map $http_referer $bad_words { # START WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************ - include /usr/local/nginx/bots.d/whitelist-domains.conf; + include /etc/nginx/mybots.d/whitelist-domains.conf; # ********************************************************************** # END WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -788,7 +788,7 @@ map $http_referer $bad_words { # START CUSTOM BAD REFERRER WORDS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ****************************************************************************** - include /usr/local/nginx/bots.d/bad-referrer-words.conf; + include /etc/nginx/mybots.d/bad-referrer-words.conf; # **************************************************************************** # END CUSTOM BAD REFERRER WORDS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -834,7 +834,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 -# /usr/local/nginx/bots.d/custom-bad-referrers.conf +# /etc/nginx/mybots.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. @@ -863,7 +863,7 @@ map $http_referer $bad_referer { # START WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************ - include /usr/local/nginx/bots.d/whitelist-domains.conf; + include /etc/nginx/mybots.d/whitelist-domains.conf; # ********************************************************************** # END WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -880,7 +880,7 @@ map $http_referer $bad_referer { # START CUSTOM BAD REFERRERS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************* - include /usr/local/nginx/bots.d/custom-bad-referrers.conf; + include /etc/nginx/mybots.d/custom-bad-referrers.conf; # *********************************************************************** # END CUSTOM BAD REFERRERS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6641,7 +6641,7 @@ geo $validate_client { # START WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************** - include /usr/local/nginx/bots.d/whitelist-ips.conf; + include /etc/nginx/mybots.d/whitelist-ips.conf; # ************************************************************************ # END WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6808,7 +6808,7 @@ geo $validate_client { # START BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ******************************************************************** - include /usr/local/nginx/bots.d/blacklist-ips.conf; + include /etc/nginx/mybots.d/blacklist-ips.conf; # ****************************************************************** # END BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6829,7 +6829,7 @@ geo $ratelimited { # START WHITELISTED IP RANGES2 ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # *************************************************************************** - include /usr/local/nginx/bots.d/whitelist-ips.conf; + include /etc/nginx/mybots.d/whitelist-ips.conf; # ************************************************************************* # END WHITELISTED IP RANGES2 ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### diff --git a/.dev-tools/_curl_tests/curltest1.txt b/.dev-tools/_curl_tests/curltest1.txt index efb634764..78227cfb9 100755 --- a/.dev-tools/_curl_tests/curltest1.txt +++ b/.dev-tools/_curl_tests/curltest1.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Sep 5 11:10:43 SAST 2017 +Last Tested: Tue Sep 5 11:20:20 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 efb634764..78227cfb9 100755 --- a/.dev-tools/_curl_tests/curltest2.txt +++ b/.dev-tools/_curl_tests/curltest2.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Sep 5 11:10:43 SAST 2017 +Last Tested: Tue Sep 5 11:20:20 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 efb634764..78227cfb9 100755 --- a/.dev-tools/_curl_tests/curltest3.txt +++ b/.dev-tools/_curl_tests/curltest3.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Sep 5 11:10:43 SAST 2017 +Last Tested: Tue Sep 5 11:20:20 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 efb634764..78227cfb9 100755 --- a/.dev-tools/_curl_tests/curltest4.txt +++ b/.dev-tools/_curl_tests/curltest4.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Sep 5 11:10:43 SAST 2017 +Last Tested: Tue Sep 5 11:20:20 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 c20b9ae87..23469205f 100755 --- a/.dev-tools/_curl_tests/curltest5.txt +++ b/.dev-tools/_curl_tests/curltest5.txt @@ -1,4 +1,4 @@ -Last Tested: Tue Sep 5 11:10:43 SAST 2017 +Last Tested: Tue Sep 5 11:20:20 SAST 2017