From 9d483af7bb1d60529a70990374cc24ada7bc74b5 Mon Sep 17 00:00:00 2001
From: Pawel Krawczyk <p.krawczyk@kainos.com>
Date: Sun, 12 Jul 2015 10:33:54 +0100
Subject: [PATCH] load URLs from a config file

---
 blacklist.sh | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/blacklist.sh b/blacklist.sh
index 11b51d6..d88280d 100755
--- a/blacklist.sh
+++ b/blacklist.sh
@@ -4,20 +4,38 @@
 # Pawel Krawczyk 2014-2015
 # documentation https://github.com/kravietz/blacklist-scripts
 
-# Emerging Threats lists offensive IPs such as botnet command servers
-urls="http://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt"
+# try to load config file
+# it should contain one blacklist URL per line
 
-# URLs for further blocklists are appeneded below using the typical
-# shell syntax:  "$urls new_url"
+config_file="/etc/ip-blacklist.conf"
+if [ -f "${config_file}" ]; then
+    exec <"${config_file}"
+    read line
+    while [ "$line" ]; do
+        if ! echo "$line" | egrep -q '(^#|^$)'; then
+            urls="${urls} $line"
+        fi
+        read line
+    done
+else
+    # if no config file is available, load default set of blacklists
 
-# Blocklist.de collects reports from fail2ban probes, listing password brute-forces, scanners and other offenders
-urls="$urls https://www.blocklist.de/downloads/export-ips_all.txt"
+    # Emerging Threats lists offensive IPs such as botnet command servers
+    urls="http://rules.emergingthreats.net/fwrules/emerging-Block-IPs.txt"
 
-# badips.com, from score 2 up
-urls="$urls http://www.badips.com/get/list/ssh/2"
+    # URLs for further blocklists are appeneded below using the typical
+    # shell syntax:  "$urls new_url"
+
+    # Blocklist.de collects reports from fail2ban probes, listing password brute-forces, scanners and other offenders
+    urls="$urls https://www.blocklist.de/downloads/export-ips_all.txt"
+
+    # badips.com, from score 2 up
+    urls="$urls http://www.badips.com/get/list/ssh/2"
+
+    # iblocklist.com is also supported
+    # urls="$urls http://list.iblocklist.com/?list=srzondksmjuwsvmgdbhi&fileformat=p2p&archiveformat=gz&username=USERNAMEx$&pin=PIN"
+fi
 
-# iblocklist.com is also supported
-# urls="$urls http://list.iblocklist.com/?list=srzondksmjuwsvmgdbhi&fileformat=p2p&archiveformat=gz&username=USERNAMEx$&pin=PIN"
 
 # This is how it will look like on the server