Merge remote-tracking branch 'origin/next' into fifteen

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

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 795bdb19fdf900b205e443d402aa25b62d4fa7e5..b1097cd8956e2af376ba1b8081263308de3f5873 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -7,9 +7,9 @@ usr/sbin/firewall-policy
 var/ipfire/addon-lang
 var/ipfire/auth
 #var/ipfire/auth/users
-var/ipfire/backup
-#var/ipfire/backup/exclude.user
-#var/ipfire/backup/include.user
+#var/ipfire/backup
+var/ipfire/backup/exclude.user
+var/ipfire/backup/include.user
 var/ipfire/ca
 var/ipfire/certs
 #var/ipfire/certs/index.txt
@@ -155,6 +155,7 @@ var/ipfire/proxy
 #var/ipfire/proxy/calamaris
 #var/ipfire/proxy/calamaris/bin
 #var/ipfire/proxy/settings
+#var/ipfire/proxy/squid.conf
 var/ipfire/qos
 #var/ipfire/qos/bin
 #var/ipfire/qos/bin/RRD-func.pl