Merge commit 'origin/master' into next

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

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 251b287576ffeafc724fabfb440d64cae7481642..8fdd7ac96a4c5dbb86aaa3c390f5ec1429c7f7d6 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -22,11 +22,14 @@ 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
 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
@@ -52,11 +55,19 @@ 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/pl.pl
+#var/ipfire/langs/ru.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/routing
 #var/ipfire/main/settings
 #var/ipfire/menu.d
 var/ipfire/menu.d/00-menu.main
@@ -68,8 +79,10 @@ 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-imspector.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
 #var/ipfire/menu.d/EX-tripwire.menu
@@ -90,6 +103,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