removed optional GeoIP and Tor exit node blocking. Can be readded if need be later, or by using the root project

conf/blacklist/blacklist

@@ -9,8 +9,6 @@ IP_BLACKLIST_TMP=/tmp/ip-blacklist.tmp
 BLACKLISTS=(
 # 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

setup/blacklist.sh

@@ -10,7 +10,6 @@ source /etc/mailinabox.conf # load global vars
 
 cp conf/blacklist /etc/cron.daily/blacklist
 chmod a+x /etc/cron.daily/blacklist
-source setup/tor.sh
 echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections
 echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections
 apt_install -y ipset dialog iptables-persistent

setup/tor.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# tor.sh - Yes/No
-# created by Alon "ChiefGyk" Ganon
-# Alon@ganon.me
-# This will give the option of blocking Tor exit nodes
-dialog --title "Disable Tor Exit Nodes?" \
---backtitle "" \
---yesno "Would you like to block all Tor exit nodes? This will block all traffic coming from Tor which will impair people using it to \
-avoid censorship. However the majority of malicious traffic is sourced from Tor. If you change your mind later you can comment/uncomment line 14 \
-of /etc/cron.daily/blacklist where it specifies Tor Exit Nodes" 15 60
-
-# Get exit status
-# 0 means user hit [yes] button.
-# 1 means user hit [no] button.
-# 255 means user hit [Esc] key.
-response=$?
-case $response in
-   0) sed -e '13 s/^/#/' /etc/conf.daily/blacklist 
-   echo "Tor Exit Nodes Blocked";;
-   1) echo "Freedom";;
-   255) echo "[ESC] key pressed.";;
-esac