fix typos and reorder script

This commit is contained in:
Phil Connor 2024-07-07 10:26:07 -05:00
parent ba7fa334ed
commit 77ad808cb3

View File

@ -3,7 +3,7 @@ function bdsatib() {
{ {
ufw-blocklists.sh -l "bdsatib https://www.binarydefense.com/banlist.txt" ufw-blocklists.sh -l "bdsatib https://www.binarydefense.com/banlist.txt"
if ! crontab -l | grep -q "bdsatib"; then if ! crontab -l | grep -q "bdsatib"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "bdsatib https://www.binarydefense.com/banlist.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"bdsatib https://www.binarydefense.com/banlist.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -14,7 +14,7 @@ function f2ball() {
{ {
ufw-blocklists.sh -l "f2ball https://lists.blocklist.de/lists/all.txt" ufw-blocklists.sh -l "f2ball https://lists.blocklist.de/lists/all.txt"
if ! crontab -l | grep -q "f2ball"; then if ! crontab -l | grep -q "f2ball"; then
echo -e "$(crontab -u root -l)\n*/35 * * * * /usr/local/bin/ufw-blocklists.sh -l "f2ball https://lists.blocklist.de/lists/all.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n*/35 * * * * /usr/local/bin/ufw-blocklists.sh -l \"f2ball https://lists.blocklist.de/lists/all.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -25,7 +25,7 @@ function bfblocker() {
{ {
ufw-blocklists.sh -l "bfblocker https://danger.rulez.sk/projects/bruteforceblocker/blist.php" ufw-blocklists.sh -l "bfblocker https://danger.rulez.sk/projects/bruteforceblocker/blist.php"
if ! crontab -l | grep -q "bfblocker"; then if ! crontab -l | grep -q "bfblocker"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "bfblocker https://danger.rulez.sk/projects/bruteforceblocker/blist.php"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"bfblocker https://danger.rulez.sk/projects/bruteforceblocker/blist.php\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -36,7 +36,7 @@ function cinsarmy() {
{ {
ufw-blocklists.sh -l "cinsarmy http://cinsscore.com/list/ci-badguys.txt" ufw-blocklists.sh -l "cinsarmy http://cinsscore.com/list/ci-badguys.txt"
if ! crontab -l | grep -q "cinsarmy"; then if ! crontab -l | grep -q "cinsarmy"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "cinsarmy http://cinsscore.com/list/ci-badguys.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"cinsarmy http://cinsscore.com/list/ci-badguys.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -48,12 +48,12 @@ function drop() {
if grep -q -E "IPV6=(yes|YES)" /etc/default/ufw; then if grep -q -E "IPV6=(yes|YES)" /etc/default/ufw; then
ufw-blocklists.sh -l "drop https://www.spamhaus.org/drop/drop.txt" -l "dropv6 https://www.spamhaus.org/drop/dropv6.txt" ufw-blocklists.sh -l "drop https://www.spamhaus.org/drop/drop.txt" -l "dropv6 https://www.spamhaus.org/drop/dropv6.txt"
if ! crontab -l | grep -q "dropv6"; then if ! crontab -l | grep -q "dropv6"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "drop https://www.spamhaus.org/drop/drop.txt" -l "dropv6 https://www.spamhaus.org/drop/dropv6.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"drop https://www.spamhaus.org/drop/drop.txt\" -l \"dropv6 https://www.spamhaus.org/drop/dropv6.txt\"" | crontab -u root -
fi fi
else else
ufw-blocklists.sh -l "drop https://www.spamhaus.org/drop/drop.txt" ufw-blocklists.sh -l "drop https://www.spamhaus.org/drop/drop.txt"
if ! crontab -l | grep -q "drop"; then if ! crontab -l | grep -q "drop"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "drop https://www.spamhaus.org/drop/drop.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"drop https://www.spamhaus.org/drop/drop.txt\"" | crontab -u root -
fi fi
fi fi
@ -65,7 +65,7 @@ function edrop() {
{ {
ufw-blocklists.sh -l "edrop https://www.spamhaus.org/drop/edrop.txt" ufw-blocklists.sh -l "edrop https://www.spamhaus.org/drop/edrop.txt"
if ! crontab -l | grep -q "edrop"; then if ! crontab -l | grep -q "edrop"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "edrop https://www.spamhaus.org/drop/edrop.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"edrop https://www.spamhaus.org/drop/edrop.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -76,7 +76,7 @@ function feodoc2() {
{ {
ufw-blocklists.sh -l "feodoc2 https://feodotracker.abuse.ch/downloads/ipblocklist_recommended.txt" ufw-blocklists.sh -l "feodoc2 https://feodotracker.abuse.ch/downloads/ipblocklist_recommended.txt"
if ! crontab -l | grep -q "feodoc2"; then if ! crontab -l | grep -q "feodoc2"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "feodoc2 https://feodotracker.abuse.ch/downloads/ipblocklist_recommended.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"feodoc2 https://feodotracker.abuse.ch/downloads/ipblocklist_recommended.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -87,7 +87,7 @@ function feodoioc() {
{ {
ufw-blocklists.sh -l "feodoioc https://feodotracker.abuse.ch/downloads/ipblocklist.txt" ufw-blocklists.sh -l "feodoioc https://feodotracker.abuse.ch/downloads/ipblocklist.txt"
if ! crontab -l | grep -q "fedoioc"; then if ! crontab -l | grep -q "fedoioc"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "feodoioc https://feodotracker.abuse.ch/downloads/ipblocklist.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"feodoioc https://feodotracker.abuse.ch/downloads/ipblocklist.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -98,7 +98,7 @@ function firehol() {
{ {
ufw-blocklists.sh -l "firehol https://iplists.firehol.org/files/firehol_level1.netset" ufw-blocklists.sh -l "firehol https://iplists.firehol.org/files/firehol_level1.netset"
if ! crontab -l | grep -q "firehol"; then if ! crontab -l | grep -q "firehol"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "firehol https://iplists.firehol.org/files/firehol_level1.netset"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"firehol https://iplists.firehol.org/files/firehol_level1.netset\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -109,7 +109,7 @@ function greensnow() {
{ {
ufw-blocklists.sh -l "greensnow https://blocklist.greensnow.co/greensnow.txt" ufw-blocklists.sh -l "greensnow https://blocklist.greensnow.co/greensnow.txt"
if ! crontab -l | grep -q "bdsatib"; then if ! crontab -l | grep -q "bdsatib"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "greensnow https://blocklist.greensnow.co/greensnow.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"greensnow https://blocklist.greensnow.co/greensnow.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -120,7 +120,7 @@ function ipsum() {
{ {
ufw-blocklists.sh -l "ipsum https://raw.githubusercontent.com/stamparm/ipsum/master/levels/2.txt" ufw-blocklists.sh -l "ipsum https://raw.githubusercontent.com/stamparm/ipsum/master/levels/2.txt"
if ! crontab -l | grep -q "ipsum"; then if ! crontab -l | grep -q "ipsum"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "ipsum https://raw.githubusercontent.com/stamparm/ipsum/master/levels/2.txt"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"ipsum https://raw.githubusercontent.com/stamparm/ipsum/master/levels/2.txt\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -131,7 +131,7 @@ function maxmind(){
{ {
ufw-blocklists.sh -l "maxmind https://www.maxmind.com/en/anonymous_proxies" ufw-blocklists.sh -l "maxmind https://www.maxmind.com/en/anonymous_proxies"
if ! crontab -l | grep -q "maxmind"; then if ! crontab -l | grep -q "maxmind"; then
echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l "maxmind https://www.maxmind.com/en/anonymous_proxies"" | crontab -u root - echo -e "$(crontab -u root -l)\n@daily /usr/local/bin/ufw-blocklists.sh -l \"maxmind https://www.maxmind.com/en/anonymous_proxies\"" | crontab -u root -
fi fi
blocklist_menu blocklist_menu
@ -166,7 +166,7 @@ function blocklist_menu() {
elif [[ "$user_input" == '3' ]]; then elif [[ "$user_input" == '3' ]]; then
bfblocker bfblocker
elif [[ "$user_input" == '4' ]]; then elif [[ "$user_input" == '4' ]]; then
cins cinsarmy
elif [[ "$user_input" == '5' ]]; then elif [[ "$user_input" == '5' ]]; then
feodoc2 feodoc2
elif [[ "$user_input" == '6' ]]; then elif [[ "$user_input" == '6' ]]; then