]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - config/rootfiles/common/configroot
Merge branch 'next'
[ipfire-2.x.git] / config / rootfiles / common / configroot
index 61cc9310ff00ca014608b8298d27951ea2a8bc25..1027b5139e952ef8180dbb65dce8414799ac30b2 100644 (file)
@@ -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
@@ -10,13 +12,15 @@ var/ipfire/auth
 #var/ipfire/backup
 var/ipfire/backup/exclude.user
 var/ipfire/backup/include.user
+var/ipfire/ca
 var/ipfire/captive
-var/ipfire/captive/settings
+var/ipfire/captive/agb.txt
 var/ipfire/captive/clients
+var/ipfire/captive/settings
 var/ipfire/captive/voucher_out
-var/ipfire/ca
 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
@@ -26,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
@@ -37,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
@@ -55,17 +59,15 @@ var/ipfire/extrahd
 #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
@@ -75,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
@@ -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
@@ -120,12 +124,11 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-tor.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/nfs
-#var/ipfire/nfs/nfs-server
 var/ipfire/optionsfw
 #var/ipfire/optionsfw/settings
 var/ipfire/ovpn
@@ -152,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
@@ -175,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