diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf index 5dd26e64e..7b5775e4e 100644 --- a/conf.d/globalblacklist.conf +++ b/conf.d/globalblacklist.conf @@ -17,11 +17,11 @@ ### - https://github.com/oohnoitz/nginx-blacklist ### Last Updated -### Thu Feb 16 09:38:29 SAST 2017 +### Thu Feb 16 09:39:51 SAST 2017 ### End Last Updated ### Generated in -### 0.32355427742 seconds +### 0.304955005646 seconds ### End Generated in ### Tested on: nginx/1.10.0 (Ubuntu 16.04) @@ -878,7 +878,9 @@ map $http_referer $bad_referer { # Use the new include file method so any further updates will no longer require you to # have to keep putting your whitelisted domains here when updating. +# START WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### include /etc/nginx/bots.d/whitelist-domains.conf; +# END WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### # START BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### "~*000free.us" 1; @@ -4844,7 +4846,9 @@ geo $validate_client { # Use the new include file method so any further updates will no longer require you to # have to keep putting your whitelisted IP addresses here when updating. +# START WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### include /etc/nginx/bots.d/whitelist-ips.conf; +# END WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # *********** # Google Bots diff --git a/travis/globalblacklist.tpl.conf b/travis/globalblacklist.tpl.conf index 5dd26e64e..2854d6f3a 100644 --- a/travis/globalblacklist.tpl.conf +++ b/travis/globalblacklist.tpl.conf @@ -17,11 +17,11 @@ ### - https://github.com/oohnoitz/nginx-blacklist ### Last Updated -### Thu Feb 16 09:38:29 SAST 2017 +### Thu Feb 16 09:39:51 SAST 2017 ### End Last Updated ### Generated in -### 0.32355427742 seconds +### 0.304955005646 seconds ### End Generated in ### Tested on: nginx/1.10.0 (Ubuntu 16.04) @@ -878,7 +878,9 @@ map $http_referer $bad_referer { # Use the new include file method so any further updates will no longer require you to # have to keep putting your whitelisted domains here when updating. - include /etc/nginx/bots.d/whitelist-domains.conf; +# START WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### +include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travis/nginx/bots.d/whitelist-domains.conf; +# END WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### # START BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### "~*000free.us" 1; @@ -4844,7 +4846,9 @@ geo $validate_client { # Use the new include file method so any further updates will no longer require you to # have to keep putting your whitelisted IP addresses here when updating. - include /etc/nginx/bots.d/whitelist-ips.conf; +# START WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### +include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travis/nginx/bots.d/whitelist-ips.conf; +# END WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### # *********** # Google Bots