From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 Jun 2020 14:00:34 +0000 (+0200)
Subject: firewall: Rename GEOIPBLOCK table to LOCATIONBLOCK
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e6eca78b8e20fc8599d70fab4811afccb0c9fb0;p=people%2Fms%2Fipfire-2.x.git

firewall: Rename GEOIPBLOCK table to LOCATIONBLOCK

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index ba6b27f97d..8b09491268 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -612,7 +612,7 @@ sub p2pblock {
 
 sub geoipblock {
 	# Flush iptables chain.
-	run("$IPTABLES -F GEOIPBLOCK");
+	run("$IPTABLES -F LOCATIONBLOCK");
 
 	# If geoip blocking is not enabled, we are finished here.
 	if ($geoipsettings{'GEOIPBLOCK_ENABLED'} ne "on") {
@@ -625,7 +625,7 @@ sub geoipblock {
 	# is enabled.
 	foreach my $location (@locations) {
 		if(exists $geoipsettings{$location} && $geoipsettings{$location} eq "on") {
-			run("$IPTABLES -A GEOIPBLOCK -m geoip --src-cc $location -j DROP");
+			run("$IPTABLES -A LOCATIONBLOCK -m geoip --src-cc $location -j DROP");
 		}
 	}
 }
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index 00512d9fa6..5d7f1c1b4b 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -269,10 +269,10 @@ iptables_init() {
 		iptables -A OUTPUT -o "${BLUE_DEV}" -j DHCPBLUEOUTPUT
 	fi
 
-	# GeoIP block
-	iptables -N GEOIPBLOCK
-	iptables -A INPUT -j GEOIPBLOCK
-	iptables -A FORWARD -j GEOIPBLOCK
+	# Location Block
+	iptables -N LOCATIONBLOCK
+	iptables -A INPUT -j LOCATIONBLOCK
+	iptables -A FORWARD -j LOCATIONBLOCK
 
 	# trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything
 	iptables -N IPSECINPUT