diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf index 3bb9c293d..ab0b4aa57 100644 --- a/conf.d/globalblacklist.conf +++ b/conf.d/globalblacklist.conf @@ -17,11 +17,11 @@ ### - https://github.com/oohnoitz/nginx-blacklist ### Last Updated -### Thu Apr 20 14:35:28 SAST 2017 +### Thu Apr 20 14:45:12 SAST 2017 ### End Last Updated ### Generated in -### 0.282387733459 seconds +### 0.268652677536 seconds ### End Generated in ### Tested on: nginx/1.10.0 (Ubuntu 16.04) @@ -4873,9 +4873,9 @@ geo $ratelimited { default 1; 127.0.0.1 0; -# START WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### +# START WHITELISTED IP RANGES2 ### 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 ### +# END WHITELISTED IP RANGES2 ### DO NOT EDIT THIS LINE AT ALL ### } diff --git a/travisCI/globalblacklist.tpl.conf b/travisCI/globalblacklist.tpl.conf index 8a7677f07..1bf71be0a 100644 --- a/travisCI/globalblacklist.tpl.conf +++ b/travisCI/globalblacklist.tpl.conf @@ -17,11 +17,11 @@ ### - https://github.com/oohnoitz/nginx-blacklist ### Last Updated -### Thu Apr 20 14:35:28 SAST 2017 +### Thu Apr 20 14:45:12 SAST 2017 ### End Last Updated ### Generated in -### 0.282387733459 seconds +### 0.268652677536 seconds ### End Generated in ### Tested on: nginx/1.10.0 (Ubuntu 16.04) @@ -820,7 +820,6 @@ map $http_referer $bad_referer { # Read Comments inside whitelist-domains.conf for customization tips. # Updating the main globalblacklist.conf file will not touch your custom include files -# START WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### # START WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/whitelist-domains.conf; @@ -4886,9 +4885,11 @@ geo $ratelimited { default 1; 127.0.0.1 0; -# 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 ### +# START WHITELISTED IP RANGES2 ### DO NOT EDIT THIS LINE AT ALL ### + + include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/whitelist-ips.conf; + +# END WHITELISTED IP RANGES2 ### DO NOT EDIT THIS LINE AT ALL ### }