diff --git a/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test1/conf.d/globalblacklist.conf index 145bed65d..d2442af4e 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.07.781 -### Updated: Thu Jul 27 13:06:57 SAST 2017 +### Version: V3.2017.07.782 +### Updated: Thu Jul 27 13:12:31 SAST 2017 ### Bad Referrer Count: 5468 ### Bad Bot Count: 501 ################################################### 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 4ce104047..e5bb0338f 100644 --- a/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf +++ b/.dev-tools/_conf_files_test2/bots.d/whitelist-ips.conf @@ -7,4 +7,3 @@ # Only add actual IP addresses and ranges here 111.111.111.111 0; -35.192.187.174 0; diff --git a/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf b/.dev-tools/_conf_files_test2/conf.d/globalblacklist.conf index 145bed65d..550b590b3 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.07.781 -### Updated: Thu Jul 27 13:06:57 SAST 2017 +### Version: V3.2017.07.782 +### Updated: Thu Jul 27 13:12:31 SAST 2017 ### Bad Referrer Count: 5468 ### Bad Bot Count: 501 ################################################### @@ -106,7 +106,7 @@ map $http_user_agent $bad_bot { # START CUSTOM BLACKLISTED USER AGENTS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # *********************************************************************************** - include /etc/nginx/bots.d/blacklist-user-agents.conf; + include /usr/local/nginx/bots.d/blacklist-user-agents.conf; # ********************************************************************************* # END CUSTOM BLACKLISTED USER AGENTS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -749,7 +749,7 @@ map $http_referer $bad_words { # START WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************ - include /etc/nginx/bots.d/whitelist-domains.conf; + include /usr/local/nginx/bots.d/whitelist-domains.conf; # ********************************************************************** # END WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -760,7 +760,7 @@ map $http_referer $bad_words { # START CUSTOM BAD REFERRER WORDS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ****************************************************************************** - include /etc/nginx/bots.d/bad-referrer-words.conf; + include /usr/local/nginx/bots.d/bad-referrer-words.conf; # **************************************************************************** # END CUSTOM BAD REFERRER WORDS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -806,7 +806,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/bots.d/custom-bad-referrers.conf +# /usr/local/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. @@ -835,7 +835,7 @@ map $http_referer $bad_referer { # START WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************ - include /etc/nginx/bots.d/whitelist-domains.conf; + include /usr/local/nginx/bots.d/whitelist-domains.conf; # ********************************************************************** # END WHITELISTED DOMAINS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -852,7 +852,7 @@ map $http_referer $bad_referer { # START CUSTOM BAD REFERRERS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************* - include /etc/nginx/bots.d/custom-bad-referrers.conf; + include /usr/local/nginx/bots.d/custom-bad-referrers.conf; # *********************************************************************** # END CUSTOM BAD REFERRERS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6362,7 +6362,7 @@ geo $validate_client { # START WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ************************************************************************** - include /etc/nginx/bots.d/whitelist-ips.conf; + include /usr/local/nginx/bots.d/whitelist-ips.conf; # ************************************************************************ # END WHITELISTED IP RANGES ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6529,7 +6529,7 @@ geo $validate_client { # START BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # ******************************************************************** - include /etc/nginx/bots.d/blacklist-ips.conf; + include /usr/local/nginx/bots.d/blacklist-ips.conf; # ****************************************************************** # END BLACKLISTED IPS ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### @@ -6550,7 +6550,7 @@ geo $ratelimited { # START WHITELISTED IP RANGES2 ### DO NOT EDIT OR REMOVE THIS LINE AT ALL ### # *************************************************************************** - include /etc/nginx/bots.d/whitelist-ips.conf; + include /usr/local/nginx/bots.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 12049ff54..90a1694c3 100755 --- a/.dev-tools/_curl_tests/curltest1.txt +++ b/.dev-tools/_curl_tests/curltest1.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jul 27 13:12:27 SAST 2017 +Last Tested: Thu Jul 27 13:31:06 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 12049ff54..90a1694c3 100755 --- a/.dev-tools/_curl_tests/curltest2.txt +++ b/.dev-tools/_curl_tests/curltest2.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jul 27 13:12:27 SAST 2017 +Last Tested: Thu Jul 27 13:31:06 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 12049ff54..90a1694c3 100755 --- a/.dev-tools/_curl_tests/curltest3.txt +++ b/.dev-tools/_curl_tests/curltest3.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jul 27 13:12:27 SAST 2017 +Last Tested: Thu Jul 27 13:31:06 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 12049ff54..90a1694c3 100755 --- a/.dev-tools/_curl_tests/curltest4.txt +++ b/.dev-tools/_curl_tests/curltest4.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jul 27 13:12:27 SAST 2017 +Last Tested: Thu Jul 27 13:31:06 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 8d71e2472..4d44aaa9d 100755 --- a/.dev-tools/_curl_tests/curltest5.txt +++ b/.dev-tools/_curl_tests/curltest5.txt @@ -1,4 +1,4 @@ -Last Tested: Thu Jul 27 13:12:27 SAST 2017 +Last Tested: Thu Jul 27 13:31:06 SAST 2017