From 4f9b926dbaa4da7abcfa85414e1573d88e46b48e Mon Sep 17 00:00:00 2001
From: ChiefGyk <alon@ganon.me>
Date: Wed, 29 Jun 2016 08:06:54 -0400
Subject: [PATCH] used xargs to make it a bit easier for script, had it make
 /etc/iptables then copy blocklist.txt to there, which the cron.daily will
 continuously read from for it's lists

---
 blocklist.txt | 14 ++++++++++++++
 install.sh    |  2 ++
 sync-fail2ban |  8 +-------
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 blocklist.txt

diff --git a/blocklist.txt b/blocklist.txt
new file mode 100644
index 00000000..3bc41ce0
--- /dev/null
+++ b/blocklist.txt
@@ -0,0 +1,14 @@
+http://lists.blocklist.de/lists/ssh.txt
+http://lists.blocklist.de/lists/bruteforcelogin.txt
+http://lists.blocklist.de/lists/imap.txt
+http://lists.blocklist.de/lists/mail.txt
+http://lists.blocklist.de/lists/postfix.txt
+http://lists.blocklist.de/lists/apache.txt
+http://lists.blocklist.de/lists/email.txt
+http://lists.blocklist.de/lists/21.txt
+http://lists.blocklist.de/lists/25.txt
+http://lists.blocklist.de/lists/80.txt
+http://lists.blocklist.de/lists/110.txt
+http://lists.blocklist.de/lists/143.txt
+http://lists.blocklist.de/lists/443.txt
+http://lists.blocklist.de/lists/993.txt
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 8be12bba..80fda002 100755
--- a/install.sh
+++ b/install.sh
@@ -12,6 +12,8 @@ if [[ $EUID -ne 0 ]]; then
 	exit
 fi
 cp sync-fail2ban /etc/cron.daily/sync-fail2ban
+mkdir /etc/iptables
+cp blocklist.txt /etc/iptables/blocklist.txt
 chmod a+x /etc/cron.daily/sync-fail2ban
 time /etc/cron.daily/sync-fail2ban
 echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections
diff --git a/sync-fail2ban b/sync-fail2ban
index a35549ab..c0fa072d 100644
--- a/sync-fail2ban
+++ b/sync-fail2ban
@@ -31,13 +31,7 @@ badlisturls="http://antivirus.neu.edu.cn/ssh/lists/base_30days.txt http://lists.
   
 # Grab list(s) at https://www.blocklist.de/en/export.html .  Block.
 echo "Adding new blocks:"
- time  curl -s http://lists.blocklist.de/lists/ssh.txt  http://lists.blocklist.de/lists/bruteforcelogin.txt \ 
- http://lists.blocklist.de/lists/imap.txt  http://lists.blocklist.de/lists/mail.txt \ 
- http://lists.blocklist.de/lists/postfix.txt  http://lists.blocklist.de/lists/apache.txt \
- http://lists.blocklist.de/lists/email.txt  http://lists.blocklist.de/lists/21.txt \
- http://lists.blocklist.de/lists/25.txt  http://lists.blocklist.de/lists/80.txt \
- http://lists.blocklist.de/lists/110.txt  http://lists.blocklist.de/lists/143.txt \
- http://lists.blocklist.de/lists/443.txt  http://lists.blocklist.de/lists/993.txt \
+ time xargs curl -s < /etc/iptables/blocklist.txt \
   |sort -u \
   |tee $blacklistf \
   |grep -v '^#\|:' \