Merge branch 'next'

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

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 8fb66bdb8ba7584b146366b930747137d2ab7d97..8c91ca5d5d6f7219ce2a0dfaf3ae041d3defcef5 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -1,13 +1,14 @@
 usr/sbin/convert-dmz
 usr/sbin/convert-outgoingfw
 usr/sbin/convert-portfw
+usr/sbin/convert-snort
 usr/sbin/convert-xtaccess
+usr/sbin/convert-ids-modifysids-file
 usr/sbin/firewall-policy
 #var/ipfire
 var/ipfire/addon-lang
 var/ipfire/auth
 #var/ipfire/auth/users
-var/ipfire/aws-functions.pl
 #var/ipfire/backup
 var/ipfire/backup/exclude.user
 var/ipfire/backup/include.user
@@ -19,6 +20,7 @@ var/ipfire/captive/settings
 var/ipfire/captive/voucher_out
 var/ipfire/certs
 #var/ipfire/certs/index.txt
+var/ipfire/certs/index.txt.attr
 #var/ipfire/certs/serial
 var/ipfire/connscheduler
 #var/ipfire/connscheduler/connscheduler.conf
@@ -38,6 +40,7 @@ var/ipfire/dhcp
 var/ipfire/dhcpc
 var/ipfire/dns
 #var/ipfire/dns/settings
+#var/ipfire/dns/servers
 var/ipfire/dnsforward
 #var/ipfire/dnsforward/config
 var/ipfire/ethernet
@@ -48,23 +51,23 @@ var/ipfire/ethernet
 #var/ipfire/ethernet/vlans
 #var/ipfire/ethernet/wireless
 var/ipfire/extrahd
-#var/ipfire/extrahd/bin
-#var/ipfire/extrahd/bin/extrahd.pl
+var/ipfire/extrahd/bin
+var/ipfire/extrahd/bin/extrahd.pl
 #var/ipfire/extrahd/devices
 #var/ipfire/extrahd/partitions
 #var/ipfire/extrahd/scan
 #var/ipfire/extrahd/settings
 var/ipfire/firewall
 #var/ipfire/firewall/config
-#var/ipfire/firewall/geoipblock
 #var/ipfire/firewall/input
+#var/ipfire/firewall/locationblock
 #var/ipfire/firewall/outgoing
 #var/ipfire/firewall/p2protocols
 #var/ipfire/firewall/settings
 var/ipfire/fwhosts
-#var/ipfire/fwhosts/customgeoipgrp
 #var/ipfire/fwhosts/customgroups
 #var/ipfire/fwhosts/customhosts
+#var/ipfire/fwhosts/customlocationgrp
 #var/ipfire/fwhosts/customnetworks
 #var/ipfire/fwhosts/customservicegrp
 #var/ipfire/fwhosts/customservices
@@ -74,9 +77,9 @@ var/ipfire/fwlogs
 #var/ipfire/fwlogs/ipsettings
 #var/ipfire/fwlogs/portsettings
 var/ipfire/general-functions.pl
-var/ipfire/geoip-functions.pl
 var/ipfire/graphs.pl
 var/ipfire/header.pl
+var/ipfire/location-functions.pl
 var/ipfire/ids-functions.pl
 var/ipfire/isdn
 #var/ipfire/isdn/settings
@@ -100,6 +103,7 @@ var/ipfire/mac
 var/ipfire/main
 #var/ipfire/main/hosts
 #var/ipfire/main/routing
+#var/ipfire/main/security
 #var/ipfire/main/settings
 #var/ipfire/menu.d
 var/ipfire/menu.d/00-menu.main
@@ -125,8 +129,6 @@ var/ipfire/modem-lib.pl
 #var/ipfire/modem/settings
 var/ipfire/modem-lib.pl
 var/ipfire/network-functions.pl
-#var/ipfire/nfs
-#var/ipfire/nfs/nfs-server
 var/ipfire/optionsfw
 #var/ipfire/optionsfw/settings
 var/ipfire/ovpn
@@ -153,7 +155,6 @@ var/ipfire/proxy
 #var/ipfire/proxy/advanced/cre
 #var/ipfire/proxy/advanced/cre/enable
 #var/ipfire/proxy/advanced/settings
-#var/ipfire/proxy/advanced/useragents
 #var/ipfire/proxy/calamaris
 #var/ipfire/proxy/calamaris/bin
 #var/ipfire/proxy/settings
@@ -176,8 +177,8 @@ var/ipfire/remote
 #var/ipfire/remote/settings
 var/ipfire/sensors
 #var/ipfire/sensors/settings
-var/ipfire/snort
-#var/ipfire/snort/settings
+var/ipfire/suricata
+#var/ipfire/suricata/settings
 var/ipfire/time
 #var/ipfire/time/settings
 var/ipfire/updatexlrator