Merge branch 'next' into fifteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / common / misc-progs

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 4c4b9c7f3cc895f4f86646adef2b4efd5b00eb36..1ab4dec5f1aa5053d5a8a96d798f08cf7c95e870 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,12 +1,13 @@
-usr/local/bin/setaliases
-#usr/local/bin/applejuicectrl
 usr/local/bin/addonctrl
+#usr/local/bin/applejuicectrl
 usr/local/bin/backupctrl
 #usr/local/bin/clamavctrl
 usr/local/bin/dhcpctrl
+usr/local/bin/dnsmasqctrl
 usr/local/bin/extrahdctrl
+usr/local/bin/fireinfoctrl
+usr/local/bin/getconntracktable
 usr/local/bin/getipstat
-usr/local/bin/getiptstate
 #usr/local/bin/iowrap
 usr/local/bin/ipfirereboot
 usr/local/bin/ipsecctrl
@@ -14,23 +15,26 @@ usr/local/bin/launch-ether-wake
 usr/local/bin/logwatch
 #usr/local/bin/mpfirectrl
 usr/local/bin/openvpnctrl
-usr/local/bin/outgoingfwctrl
+#usr/local/bin/outgoingfwctrl
+usr/local/bin/firewallctrl
 usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
+usr/local/bin/rebuildroutes
 usr/local/bin/redctrl
 #usr/local/bin/sambactrl
-usr/local/bin/setdmzholes
-usr/local/bin/setportfw
-usr/local/bin/setxtaccess
+usr/local/bin/setaliases
 usr/local/bin/smartctrl
 usr/local/bin/snortctrl
 usr/local/bin/squidctrl
 usr/local/bin/sshctrl
 usr/local/bin/syslogdctrl
 usr/local/bin/timectrl
+#usr/local/bin/torctrl
 #usr/local/bin/tripwirectrl
-usr/local/bin/updxsetperms
+usr/local/bin/updxlratorctrl
 usr/local/bin/upnpctrl
+usr/local/bin/urlfilterctrl
+usr/local/bin/wirelessclient
 usr/local/bin/wirelessctrl
 #usr/local/bin/wlanapctrl