Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/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 353d2d007e28102ea2bf7f796511ba9a52c56a39..12d3ddd6173f8fd8a44e04ff08c845d561e5a867 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -14,8 +14,6 @@ var/ipfire/connscheduler
 #var/ipfire/connscheduler/lib.pl
 var/ipfire/countries.pl
 var/ipfire/crls
-var/ipfire/dns
-#var/ipfire/dns/settings
 var/ipfire/ddns
 #var/ipfire/ddns/config
 #var/ipfire/ddns/ipcache
@@ -29,6 +27,8 @@ var/ipfire/dhcp
 var/ipfire/dhcpc
 var/ipfire/dmzholes
 #var/ipfire/dmzholes/config
+var/ipfire/dns
+#var/ipfire/dns/settings
 var/ipfire/ethernet
 #var/ipfire/ethernet/aliases
 #var/ipfire/ethernet/known_nics
@@ -54,12 +54,15 @@ 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
 #var/ipfire/logging/settings
 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
@@ -72,6 +75,7 @@ var/ipfire/menu.d/50-firewall.menu
 var/ipfire/menu.d/60-ipfire.menu
 var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-addonsvc.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-mpfire.menu
@@ -94,6 +98,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/ipgroups
 #var/ipfire/outgoing/p2protocols
 #var/ipfire/outgoing/rules
 #var/ipfire/outgoing/settings