Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index efbc5fe933bbd179870905ffd1b0db193951ff68..5f0faf3a08c4a4902e4abbb9d4f0c9d26b474aac 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -22,6 +22,7 @@ var/ipfire/ddns
 var/ipfire/dhcp
 #var/ipfire/dhcp/advoptions
 #var/ipfire/dhcp/advoptions-list
+#var/ipfire/dhcp/dhcpd.conf.local
 #var/ipfire/dhcp/fixleases
 #var/ipfire/dhcp/settings
 var/ipfire/dhcpc
@@ -54,6 +55,7 @@ var/ipfire/lang.pl
 var/ipfire/langs
 #var/ipfire/langs/de.pl
 #var/ipfire/langs/en.pl
+#var/ipfire/langs/es.pl
 #var/ipfire/langs/fr.pl
 #var/ipfire/langs/list
 var/ipfire/logging
@@ -61,6 +63,7 @@ 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/settings
 #var/ipfire/menu.d
@@ -76,6 +79,7 @@ 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-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
 #var/ipfire/menu.d/EX-tripwire.menu
@@ -96,6 +100,9 @@ var/ipfire/outgoing
 #var/ipfire/outgoing/bin
 #var/ipfire/outgoing/bin/outgoingfw.pl
 var/ipfire/outgoing/defaultservices
+#var/ipfire/outgoing/groups
+#var/ipfire/outgoing/groups/ipgroups
+#var/ipfire/outgoing/groups/macgroups
 #var/ipfire/outgoing/p2protocols
 #var/ipfire/outgoing/rules
 #var/ipfire/outgoing/settings