X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Frootfiles%2Fcommon%2Fconfigroot;h=8c91ca5d5d6f7219ce2a0dfaf3ae041d3defcef5;hb=504e72e17317e9b153d5dc6c0198c6df7c5f750a;hp=f6cbb61efd1e8f5468dbbb785905732cb1f78634;hpb=f09f3fd8819de0565c6ac73048b0dcfcff0c75ec;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index f6cbb61efd..8c91ca5d5d 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -1,7 +1,9 @@
 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
@@ -11,8 +13,14 @@ var/ipfire/auth
 var/ipfire/backup/exclude.user
 var/ipfire/backup/include.user
 var/ipfire/ca
+var/ipfire/captive
+var/ipfire/captive/agb.txt
+var/ipfire/captive/clients
+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
@@ -22,7 +30,6 @@ var/ipfire/crls
 var/ipfire/ddns
 #var/ipfire/ddns/config
 #var/ipfire/ddns/ipcache
-#var/ipfire/ddns/noipsettings
 #var/ipfire/ddns/settings
 var/ipfire/dhcp
 #var/ipfire/dhcp/advoptions
@@ -33,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
@@ -43,25 +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/dmz
-#var/ipfire/firewall/geoipblock
 #var/ipfire/firewall/input
-#var/ipfire/firewall/nat
+#var/ipfire/firewall/locationblock
 #var/ipfire/firewall/outgoing
 #var/ipfire/firewall/p2protocols
 #var/ipfire/firewall/settings
 var/ipfire/fwhosts
 #var/ipfire/fwhosts/customgroups
-#var/ipfire/fwhosts/customgeoipgrp
 #var/ipfire/fwhosts/customhosts
+#var/ipfire/fwhosts/customlocationgrp
 #var/ipfire/fwhosts/customnetworks
 #var/ipfire/fwhosts/customservicegrp
 #var/ipfire/fwhosts/customservices
@@ -71,9 +77,10 @@ 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
 var/ipfire/key
@@ -94,9 +101,9 @@ var/ipfire/logging
 var/ipfire/mac
 #var/ipfire/mac/settings
 var/ipfire/main
-#var/ipfire/main/disable_nf_sip
 #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
@@ -111,24 +118,17 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-apcupsd.menu
 #var/ipfire/menu.d/EX-asterisk.menu
 #var/ipfire/menu.d/EX-bluetooth.menu
-#var/ipfire/menu.d/EX-imspector.menu
+#var/ipfire/menu.d/EX-guardian.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
 #var/ipfire/menu.d/EX-tor.menu
-#var/ipfire/menu.d/EX-tripwire.menu
 #var/ipfire/menu.d/EX-wlanap.menu
 var/ipfire/modem
+var/ipfire/modem-lib.pl
 #var/ipfire/modem/defaults
 #var/ipfire/modem/settings
 var/ipfire/modem-lib.pl
 var/ipfire/network-functions.pl
-var/ipfire/net-traffic
-#var/ipfire/net-traffic/net-traffic-admin.pl
-#var/ipfire/net-traffic/net-traffic-lib.pl
-#var/ipfire/net-traffic/settings
-#var/ipfire/net-traffic/templates
-#var/ipfire/nfs
-#var/ipfire/nfs/nfs-server
 var/ipfire/optionsfw
 #var/ipfire/optionsfw/settings
 var/ipfire/ovpn
@@ -155,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
@@ -178,13 +177,10 @@ 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/tripwire
-#var/ipfire/tripwire/report
-#var/ipfire/tripwire/settings
 var/ipfire/updatexlrator
 var/ipfire/updatexlrator/autocheck
 var/ipfire/updatexlrator/bin