From b3fe873750f7eac0fbb4f3728d88fefdca53db5a Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Tue, 25 Jun 2019 12:39:06 +0200
Subject: [PATCH] Deprecate blacklist-domains.conf

---
 .travis.yml                   |  1 -
 bots.d/blacklist-domains.conf | 49 ++++++-----------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5aa5ef82..2f48fa758 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,6 @@ script:
   - bash .dev-tools/test-blocker.sh
   - bash .dev-tools/test-blocker-badwords.sh
   - bash .dev-tools/test-blocker-whitelist-domains.sh
-  - bash .dev-tools/test-blocker-blacklist-domains.sh
   - bash .dev-tools/test-blocker-whitelist.sh
   - bash .dev-tools/modify-files-and-commit.sh
 
diff --git a/bots.d/blacklist-domains.conf b/bots.d/blacklist-domains.conf
index 00a28d7e8..0d3b8c26f 100644
--- a/bots.d/blacklist-domains.conf
+++ b/bots.d/blacklist-domains.conf
@@ -1,45 +1,12 @@
-# EDIT THIS FILE AS YOU LIKE TO BLACKLIST YOUR OWN CUSTOM DOMAIN NAMES ###
+# DEPRECATED
 
-### VERSION INFORMATION #
-###################################################
-### Version: V4.2019.05
-### Updated: 2019-06-24
-###################################################
-### VERSION INFORMATION ##
+# This file is no longer used
 
-##############################################################################                                                                
-#       _  __     _                                                          #
-#      / |/ /__ _(_)__ __ __                                                 #
-#     /    / _ `/ / _ \\ \ /                                                 #
-#    /_/|_/\_, /_/_//_/_\_\                                                  #
-#       __/___/      __   ___       __     ___  __         __                #
-#      / _ )___ ____/ /  / _ )___  / /_   / _ )/ /__  ____/ /_____ ____      #
-#     / _  / _ `/ _  /  / _  / _ \/ __/  / _  / / _ \/ __/  '_/ -_) __/      #
-#    /____/\_,_/\_,_/  /____/\___/\__/  /____/_/\___/\__/_/\_\\__/_/         #
-#                                                                            #
-##############################################################################                                                                
-
-# Add One Entry Per Line - List all your own extra domains you want to blacklist.
-# This file must exist on your system or Nginx will fail a reload due to a missing file
-# Automatic updates will never be able to remove this custom list of yours 
-# Add One Entry Per Line
-
-# Make sure any domains have dots and special characters escaped as per the Regex examples below.
-# For example myblacklisteddomainname.com should be entered as myfirstowndomainname\.com
-# and my-second-blacklisted.com should be entered as my\-second\-owndomainname\.com
-
-# *****************************************************************************************
-# PLEASE MAKE SURE that you use word regex boundaries to avoid false positive detection !!!
-# *****************************************************************************************
-
-# As you can see in the examples below the domain "myblacklisteddomainname\.com" is entered with a preceding \b and an ending \b
-# this makes it now "\bmyblacklisteddomainname\.com\b". It is crucial to use the word boundaries regex formatting. 
-
-# BY DEFAULT ALL THE EXAMPLES BELOW ARE COMMENTED OUT AND HENCE NOT ENABLED
-# ---------
-# EXAMPLES:
-# ---------
-#	"~*\bmyblacklisteddomainname\.com\b" 		1;
-#	"~*\bmy\-second\-blacklisted\.com\b"		1;
+# ********************************************
+# ALL Blacklisting AND Whitelisting is done in
+# ********************************************
 
+#  	include /etc/nginx/bots.d/whitelist-domains.conf; < whitelisting of domains (can also blacklist)
+#  	include /etc/nginx/bots.d/custom-bad-referrers.conf; < whitelisting AND blacklisting of domains and referrer domains
 
+# DEPRECATED