Merge remote-tracking branch 'mfischer/python' into next

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

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index d2d2a5de25bd0ff4f92da439f1963e4c9579d12d..349aac76cbb18ea9773cc029485f152ec711b6ba 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -2,6 +2,8 @@ usr/local/bin/addonctrl
 #usr/local/bin/applejuicectrl
 usr/local/bin/backupctrl
 #usr/local/bin/clamavctrl
+usr/local/bin/collectdctrl
+usr/local/bin/ddnsctrl
 usr/local/bin/dhcpctrl
 usr/local/bin/dnsmasqctrl
 usr/local/bin/extrahdctrl
@@ -15,8 +17,8 @@ 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/forwardfwctrl
+#usr/local/bin/outgoingfwctrl
+usr/local/bin/firewallctrl
 usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
@@ -24,7 +26,6 @@ usr/local/bin/rebuildroutes
 usr/local/bin/redctrl
 #usr/local/bin/sambactrl
 usr/local/bin/setaliases
-usr/local/bin/setportfw
 usr/local/bin/smartctrl
 usr/local/bin/snortctrl
 usr/local/bin/squidctrl