From 4f0096c3c26042b0fe2b1b63bdeb0a36538cbde0 Mon Sep 17 00:00:00 2001
From: ChiefGyk <alon@ganon.me>
Date: Wed, 29 Jun 2016 10:18:56 -0400
Subject: [PATCH] somes code fixes and lines added for fixes

---
 blacklist  | 15 ++++-----------
 install.sh |  7 ++++---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/blacklist b/blacklist
index 226f18e4..287f9071 100644
--- a/blacklist
+++ b/blacklist
@@ -7,7 +7,6 @@ list="chinese nigerian russian lacnic exploited-servers"
 BLACKLISTS=(
 "http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs
 "http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1"  # TOR Exit Nodes
-"http://www.maxmind.com/en/anonymous_proxies" # MaxMind GeoIP Anonymous Proxies
 "http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
 "http://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP)
 "http://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List
@@ -21,16 +20,6 @@ do
     grep -Po '(?:\d{1,3}\.){3}\d{1,3}(?:/\d{1,2})?' $IP_TMP >> $IP_BLACKLIST_TMP
 done
 
-# This part may not work for everyone, it seems wizcraft doesn't allow all VPS wget access, but I am looking into it
-for i in `echo $list`; do
-        # Download
-        wget --quiet http://www.wizcrafts.net/$i-iptables-blocklist.html
-        # Grep all but ip blocks
-        cat $i-iptables-blocklist.html | grep -v \< | grep -v \: | grep -v \; | grep -v \# | grep [0-9] > $i.txt
-        # Consolidate
-        cat $i.txt >> $IP_BLACKLIST_TMP
-done
-
 sort $IP_BLACKLIST_TMP -n | uniq > $IP_BLACKLIST
 rm $IP_BLACKLIST_TMP
 wc -l $IP_BLACKLIST
@@ -40,3 +29,7 @@ egrep -v "^#|^$" $IP_BLACKLIST | while IFS= read -r ip
 do
         ipset add blacklist $ip
 done
+
+# save IPtable rules
+ipset save blacklist > /etc/ipset/blacklist
+iptables-save > /etc/iptables.up.rules
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 0dd88a63..6af563b9 100755
--- a/install.sh
+++ b/install.sh
@@ -12,14 +12,15 @@ if [[ $EUID -ne 0 ]]; then
 	echo
 	exit
 fi
-echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections
-echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections
 apt-get update
 apt-get install -y ipset 
+mkdir /etc/ipset
 ipset create blacklist hash:net
 iptables -I INPUT -m set --match-set blacklist src -j DROP
 cp blacklist /etc/cron.daily/blacklist
 chmod a+x /etc/cron.daily/blacklist
 time /etc/cron.daily/blacklist
-apt-get install -y iptables-persistent
+iptables-save > /etc/iptables.up.rules
+sed -e "\$apost up ipset restore < /etc/ipset/blacklist" /etc/network/interfaces
+sed -e "\$apost up iptables-restore < /etc/iptables.up.rules" /etc/network/interfaces
 echo "Blacklist has been installed. It will run daily automatically."