From d827ba19347dac50d1b6367734e8833afa0f9706 Mon Sep 17 00:00:00 2001 From: Mitchell Krog UB1 Date: Thu, 20 Apr 2017 14:35:28 +0200 Subject: [PATCH] Version 2.2017.07 - MAJOR VERSION UPDATE --- conf.d/globalblacklist.conf | 4 ++-- travisCI/globalblacklist.tpl.conf | 27 +++++++++++++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf index 36ec1796a..3bb9c293d 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:31:18 SAST 2017 +### Thu Apr 20 14:35:28 SAST 2017 ### End Last Updated ### Generated in -### 0.269454717636 seconds +### 0.282387733459 seconds ### End Generated in ### Tested on: nginx/1.10.0 (Ubuntu 16.04) diff --git a/travisCI/globalblacklist.tpl.conf b/travisCI/globalblacklist.tpl.conf index 7c4710f9d..8a7677f07 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:31:18 SAST 2017 +### Thu Apr 20 14:35:28 SAST 2017 ### End Last Updated ### Generated in -### 0.269454717636 seconds +### 0.282387733459 seconds ### End Generated in ### Tested on: nginx/1.10.0 (Ubuntu 16.04) @@ -209,7 +209,9 @@ map $http_user_agent $bad_bot { # user-agents you wish to permanently block # START BLACKLISTED USER AGENTS ### DO NOT EDIT THIS LINE AT ALL ### -include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/blacklist-user-agents.conf; + + include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/blacklist-user-agents.conf; + # END BLACKLISTED USER AGENTS ### DO NOT EDIT THIS LINE AT ALL ### # START BAD BOTS ### DO NOT EDIT THIS LINE AT ALL ### @@ -743,7 +745,9 @@ map $http_referer $bad_words { # Updating the main globalblacklist.conf file will not touch your custom include files # START CUSTOM BAD REFERRER WORDS ### DO NOT EDIT THIS LINE AT ALL ### -include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/bad-referrer-words.conf; + + include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/bad-referrer-words.conf; + # END CUSTOM BAD REFERRER WORDS ### DO NOT EDIT THIS LINE AT ALL ### } @@ -817,7 +821,10 @@ map $http_referer $bad_referer { # Updating the main globalblacklist.conf file will not touch your custom include files # 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; +# 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; + # END WHITELISTED DOMAINS ### DO NOT EDIT THIS LINE AT ALL ### # ******************************************* @@ -828,7 +835,9 @@ include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisC # permanently included and blocked - avoid duplicates in your custom file # START CUSTOM BAD REFERRERS ### DO NOT EDIT THIS LINE AT ALL ### -include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/custom-bad-referrers.conf; + + include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/custom-bad-referrers.conf; + # END CUSTOM BAD REFERRERS ### DO NOT EDIT THIS LINE AT ALL ### # START BAD REFERERS ### DO NOT EDIT THIS LINE AT ALL ### @@ -4717,7 +4726,7 @@ geo $validate_client { # START WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### -\include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/whitelist-ips.conf; + include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/whitelist-ips.conf; # END WHITELISTED IP RANGES ### DO NOT EDIT THIS LINE AT ALL ### @@ -4860,7 +4869,9 @@ geo $validate_client { # Updating the main globalblacklist.conf file will not touch your custom include files # START BLACKLISTED IPS ### DO NOT EDIT THIS LINE AT ALL ### -include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/blacklist-ips.conf; + + include /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/nginx/bots.d/blacklist-ips.conf; + # END BLACKLISTED IPS ### DO NOT EDIT THIS LINE AT ALL ### }