kernel: disable FW_LOADER_USER_HELPER_FALLBACK

[people/pmueller/ipfire-2.x.git] / config / menu / 30-network.menu

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index bb9205af290ff99bad7b0aa9d213766bbd5c5665..9b27de8727b6993401ace1429e9e1e551b4ef941 100644 (file)
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -3,9 +3,9 @@
                                'title' => "$Lang::tr{'net config'}",
                                'enabled' => 0,
                                };
-    $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
+    $subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}",
                                'uri' => '/cgi-bin/proxy.cgi',
-                               'title' => "Webproxy",
+                               'title' => "$Lang::tr{'web proxy'}",
                                'enabled' => 1,
                                };
     $subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'},
@@ -23,6 +23,11 @@
                                 'title' => "$Lang::tr{'dhcp server'}",
                                 'enabled' => 1,
                                 };
+       $subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive'},
+                               'uri' => '/cgi-bin/captive.cgi',
+                               'title' => $Lang::tr{'Captive'},
+                               'enabled' => 1,
+                               };
     $subnetwork->{'40.scheduler'} = {
                                 'caption' => $Lang::tr{'connscheduler'},
                                 'uri' => '/cgi-bin/connscheduler.cgi',
@@ -35,24 +40,30 @@
                                 'title' => "$Lang::tr{'edit hosts'}",
                                 'enabled' => 1,
                                 };
-    $subnetwork->{'51.routes'} = {
+    $subnetwork->{'51.dnsmenu'} = {
+                                  'caption' => $Lang::tr{'dns menu'},
+                                  'uri' => '/cgi-bin/dns.cgi',
+                                  'title' => "$Lang::tr{'dns menu'}",
+                                  'enabled' => `grep "RED_TYPE=DHCP" /var/ipfire/ethernet/settings`,
+                                  };
+    $subnetwork->{'52.dnsforward'} = {
+                                  'caption' => $Lang::tr{'dnsforward'},
+                                  'uri' => '/cgi-bin/dnsforward.cgi',
+                                  'title' => "$Lang::tr{'dnsforward'}",
+                                  'enabled' => 1
+                                  };
+    $subnetwork->{'60.routes'} = {
                                 'caption' => $Lang::tr{'static routes'},
                                 'uri' => '/cgi-bin/routing.cgi',
                                 'title' => "$Lang::tr{'static routes'}",
                                 'enabled' => 1,
                                 };
-    $subnetwork->{'60.aliases'} = {
+    $subnetwork->{'70.aliases'} = {
                                  'caption' => $Lang::tr{'aliases'},
                                  'uri' => '/cgi-bin/aliases.cgi',
                                  'title' => "$Lang::tr{'aliases'}",
                                  'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`,
                                  };
-    $subnetwork->{'70.dnsmenu'} = {
-                                 'caption' => $Lang::tr{'dns menu'},
-                                 'uri' => '/cgi-bin/dns.cgi',
-                                 'title' => "$Lang::tr{'dns menu'}",
-                                 'enabled' => `grep "RED_TYPE=DHCP" /var/ipfire/ethernet/settings`,
-                                 };
     $subnetwork->{'80.macadressmenu'} = {
                                  'caption' => $Lang::tr{'mac address menu'},
                                  'uri' => '/cgi-bin/mac.cgi',