From 097adec5d20c56eb99e7ead2121f7e9896faed43 Mon Sep 17 00:00:00 2001
From: ChiefGyk <alon@ganon.me>
Date: Wed, 29 Jun 2016 12:37:46 -0400
Subject: [PATCH] polish
---
README.md | 3 +++
blacklist | 26 +++++++++++++++++---------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 3d3d5fd9..3e6fc0a1 100644
--- a/README.md
+++ b/README.md
@@ -6,5 +6,8 @@ Script is pretty self explanatory it prepares iptables, ipset, and the cron tab.
2.0 has been rewritten with help from some research to use IPset and far more tables and lists resourced. Please do not run this more than once per day, per server.
This also adds persistence, and removes iptables-persistent from 1.0 as a requirement. In fact you won't need it at all. I average thousands of more malicious IP addresses now ~48,000 as of testing. Maximum ipset can handle is 65535 from what I have read.
Tested on Ubuntu 14.04LTS for my own servers, so please test on your own systems before fully deploying.
+
+Simply run this once, and that's it.
+sudo ./install.sh
alon@ganon.me
https://alonganon.info
\ No newline at end of file
diff --git a/blacklist b/blacklist
index 095b9ac7..27d701e2 100644
--- a/blacklist
+++ b/blacklist
@@ -1,18 +1,26 @@
+# I found this script somewhere a long time ago and modified it
#!/bin/bash
IP_TMP=/tmp/ip.tmp
IP_BLACKLIST=/etc/ip-blacklist.conf
IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp
IP_BLACKLIST_CUSTOM=/etc/ip-blacklist-custom.conf # optional
-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://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
-"http://www.openbl.org/lists/base.txt" # OpenBL.org 30 day List
-"http://www.autoshun.org/files/shunlist.csv" # Autoshun Shun List
-"http://lists.blocklist.de/lists/all.txt" # blocklist.de attackers
+# Project Honey Pot Directory of Dictionary Attacker IPs
+"http://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1"
+# TOR Exit Nodes
+"http://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1"
+# BruteForceBlocker
+"http://danger.rulez.sk/projects/bruteforceblocker/blist.php"
+# Spamhaus
+"http://www.spamhaus.org/drop/drop.lasso"
+# C.I. Army
+"http://cinsscore.com/list/ci-badguys.txt"
+# OpenBL.org
+"http://www.openbl.org/lists/base.txt"
+#Autoshun
+"http://www.autoshun.org/files/shunlist.csv"
+#Blocklist.de
+"http://lists.blocklist.de/lists/all.txt"
)
for i in "${BLACKLISTS[@]}"
do