Makefile angepasst fuer backupctrl

Menueeintraege fuer mpfire und backup

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@696 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu
index fdc5dfc11d236936c40aaae10299eccef0ce33ef..692f133f8e8b052c6d9fcc39f5a532b4a2ce4d89 100644 (file)
--- a/config/menu/10-system.menu
+++ b/config/menu/10-system.menu
@@ -22,6 +22,12 @@
                                'title' => "$Lang::tr{'gui settings'}",
                                'enabled' => 1,
                                };
+    $subsystem->{'40.backup'} = {
+                               'caption' => $Lang::tr{'backup'},
+                               'uri' => '/cgi-bin/backup.cgi',
+                               'title' => "$Lang::tr{'backup'}",
+                               'enabled' => 1,
+                               };
     $subsystem->{'99.credits'} = {
                                'caption' => $Lang::tr{'credits'},
                                'uri' => '/cgi-bin/credits.cgi',

diff --git a/config/menu/EX-mpfire.menu b/config/menu/EX-mpfire.menu
new file mode 100644 (file)
index 0000000..afba4db
--- /dev/null
+++ b/config/menu/EX-mpfire.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'40.mpfire'} = {'caption' => $Lang::tr{'mpfire'},
+                                 'uri' => '/cgi-bin/mpfire.cgi',
+                                 'title' => $Lang::tr{'mpfire'},
+                                 'enabled' => 1,
+                                 };

diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire
index 258cd6d9d78535a550b2ed5633f9e1ad5f8c6fc4..0f554dfe931eda2ba7ab2c5a3eb57f142db9d10a 100644 (file)
--- a/config/rootfiles/packages/mpfire
+++ b/config/rootfiles/packages/mpfire
@@ -1,5 +1,6 @@
 usr/local/bin/mpfirectrl
 srv/web/ipfire/cgi-bin/mpfire.cgi
+var/ipfire/menu.d/EX-mpfire.menu
 var/ipfire/mpfire
 var/ipfire/mpfire/bin
 var/ipfire/mpfire/bin/mpfire.pl

diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index 4170e7b72d2f0b9e0ab39c4e8e250f5e4b2705ab..c7eb052c07278d5fd5d710c63e27971459d65b0a 100644 (file)
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -7,7 +7,7 @@ PROGS = iowrap
 SUID_PROGS = setdmzholes setportfw setfilters setxtaccess \
        squidctrl restartssh ipfirereboot setaliases \
        ipsecctrl timectrl dhcpctrl snortctrl \
-       applejuicectrl rebuildhosts backupctrl\
+       applejuicectrl rebuildhosts backupctrl \
        restartsyslogd logwatch openvpnctrl outgoingfwctrl \
        restartwireless getipstat qosctrl launch-ether-wake \
        redctrl extrahdctrl sambactrl upnpctrl tripwirectrl \