external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-21 03:02:09 +00:00
Code Issues Releases Wiki Activity

moved persistence to front, pulled iptables-persistence from another github and forked it. Using that in /etc/init.d/iptables-persistent so it handles ipset as well to make things easier. Also allows you to load and save much easier for both iptables and ipset.

Browse Source
This commit is contained in:
ChiefGyk 2016-06-29 21:07:11 -04:00
parent a1698f82ef
commit 67e40c07b8
6 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/blacklist
View File

@ -102,7 +102,4 @@ echo "Done!"
# remove the spam list # remove the spam list
unlink $FILE unlink $FILE
# Persistence /etc/init.d/iptables-persistent save
ipset save > /etc/iptables/rules.ipsets
iptables-save > /etc/iptables/rules.v4
ip6tables-save > /etc/iptables/rules.v6

3
conf/china
View File

@ -3,5 +3,4 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.china > /tmp/china.sh
chmod +x /tmp/china.sh chmod +x /tmp/china.sh
source /tmp/china.sh source /tmp/china.sh
rm -f /tmp/china.sh rm -f /tmp/china.sh
invoke-rc.d iptables-persistent save /etc/init.d/iptables-persistent save

14
conf/dialog.sh
View File

@ -26,31 +26,23 @@ clear
case $CHOICE in case $CHOICE in
1) 1)
echo "Are you Donald Trump?" echo "Are you Donald Trump?"
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections
cp conf/china /etc/cron.weekly/china cp conf/china /etc/cron.weekly/china
chmod +x /etc/cron.weekly/china chmod +x /etc/cron.weekly/china
time /etc/cron.weekly/china time /etc/cron.weekly/china
apt-get install -y iptables-persistent
;; ;;
2) 2)
echo "Starting the Korean war again" echo "Starting the Korean war again"
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections
cp conf/korea /etc/cron.weekly/korea cp conf/korea /etc/cron.weekly/korea
chmod +x /etc/cron.weekly/korea chmod +x /etc/cron.weekly/korea
time /etc/cron.weekly/korea time /etc/cron.weekly/korea
apt-get install -y iptables-persistent ;;
;;
3) 3)
echo "Blocking almost 1/3 of the world" echo "Blocking almost 1/3 of the world"
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections
cp conf/sinokorea /etc/cron.weekly/sinokorea cp conf/sinokorea /etc/cron.weekly/sinokorea
chmod +x /etc/cron.weekly/sinokorea chmod +x /etc/cron.weekly/sinokorea
time /etc/cron.weekly/sinokorea time /etc/cron.weekly/sinokorea
apt-get install -y iptables-persistent
;; ;;
4) echo "doing nothing" 4) echo "doing nothing"
;; ;;
esac esac

3
conf/korea
View File

@ -3,4 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.korea > /tmp/korea.sh
chmod +x /tmp/korea.sh chmod +x /tmp/korea.sh
source /tmp/korea.sh source /tmp/korea.sh
rm -f /tmp/korea.sh rm -f /tmp/korea.sh
invoke-rc.d iptables-persistent save /etc/init.d/iptables-persistent save

4
conf/sinokorea
View File

@ -3,5 +3,5 @@ curl http://www.okean.com/antispam/iptables/rc.firewall.sinokorea > /tmp/sinokor
chmod +x /tmp/sinokorea.sh chmod +x /tmp/sinokorea.sh
source /tmp/sinokorea.sh source /tmp/sinokorea.sh
rm -f /tmp/sinokorea.sh rm -f /tmp/sinokorea.sh
invoke-rc.d iptables-persistent save ipset save > /etc/ipset.up.rules
iptables-save > /etc/iptables.up.rules

16
install.sh
View File

@ -13,22 +13,16 @@ if [[ $EUID -ne 0 ]]; then
echo echo
exit exit
fi fi
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v4 boolean false | debconf-set-selections
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean false | debconf-set-selections
apt-get update apt-get update
apt-get install -y ipset dialog apt-get install -y ipset dialog iptables-persistent
mkdir /etc/ipset cp conf/iptables-persistent /etc/init.d/iptables-persistent
ipset create blacklist hash:net ipset create blacklist hash:net
iptables -I INPUT -m set --match-set blacklist src -j DROP iptables -I INPUT -m set --match-set blacklist src -j DROP
cp conf/blacklist /etc/cron.daily/blacklist cp conf/blacklist /etc/cron.daily/blacklist
chmod a+x /etc/cron.daily/blacklist chmod a+x /etc/cron.daily/blacklist
time /etc/cron.daily/blacklist time /etc/cron.daily/blacklist
source conf/dialog.sh source conf/dialog.sh
apt-get install -y iptables-persistent /etc/init.d/iptables-persistent save
cp conf/iptables-persistent /etc/init.d/iptables-persistent
iptables-save > /etc/iptables/rules.v4
ip6tables-save > /etc/iptables/rules.v6
#invoke-rc.d iptables-persistent save
#sed -e '$i \/sbin/iptables-restore < /etc/iptables_rules\n' /etc/rc.local
#sed -i -e '$ \/sb
echo "Blacklist has been installed. It will run daily automatically." echo "Blacklist has been installed. It will run daily automatically."