Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / config / menu / 50-firewall.menu

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 5ec1f67fc51c14f841c508b6a0c44f91f7afacfa..6ae9687dc46c095b6a584a199516a3a4b9fc15e9 100644 (file)
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -27,10 +27,10 @@
                                'title' => "P2P-Block",
                                'enabled' => 1,
                                };
-    $subfirewall->{'60.geoipblock'} = {
-                               'caption' => $Lang::tr{'geoipblock'},
-                               'uri' => '/cgi-bin/geoip-block.cgi',
-                               'title' => $Lang::tr{'geoipblock'},
+    $subfirewall->{'60.locationblock'} = {
+                               'caption' => $Lang::tr{'locationblock'},
+                               'uri' => '/cgi-bin/location-block.cgi',
+                               'title' => $Lang::tr{'locationblock'},
                                'enabled' => 1,
                                };
     $subfirewall->{'70.wireless'} = {
@@ -39,13 +39,7 @@
                                'title' => "$Lang::tr{'blue access'}",
                                'enabled' => 1,
                                 };                      
-    $subfirewall->{'80.upnp'} = {
-                               'caption' => 'UPnP',
-                               'uri' => '/cgi-bin/upnp.cgi',
-                               'title' => "Universal Plug and Play",
-                               'enabled' => 0,
-                               };
-       $subfirewall->{'90.iptables'} = {
+    $subfirewall->{'90.iptables'} = {
                                'caption' => $Lang::tr{'ipts'},
                                'uri' => '/cgi-bin/iptables.cgi',
                                'title' => "$Lang::tr{'ipts'}",