Merge remote-tracking branch 'origin/next'

[people/pmueller/ipfire-2.x.git] / config / backup / include

diff --git a/config/backup/include b/config/backup/include
index 551b52df287a01041009944fa4be92288b0007a5..59430c576ce8b19d8e8ab647d3b70636529080cc 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -4,18 +4,28 @@
 /var/ipfire/*/config
 /var/ipfire/*/enable
 /var/ipfire/*/*enable*
+/var/ipfire/ovpn/collectd.vpn
+/etc/unbound
 /etc/passwd
 /etc/shadow
 /etc/group
 /etc/ipsec.user.*
+/etc/ipsec.user-post.conf
 /etc/sysconfig/*
 /etc/hosts*
-/etc/httpd/*
+/etc/httpd/server.crt
+/etc/httpd/server.csr
+/etc/httpd/server.key
+/etc/httpd/server-ecdsa.crt
+/etc/httpd/server-ecdsa.csr
+/etc/httpd/server-ecdsa.key
 /etc/ssh/ssh_host*
+/etc/ssh/sshd_config
+/etc/logrotate.d
 /var/ipfire/auth/users
 /var/ipfire/dhcp/*
 /var/ipfire/dnsforward/*
-/var/ipfire/forward
+/var/ipfire/firewall
 /var/ipfire/fwhosts
 /var/ipfire/main/*
 /var/ipfire/ovpn
@@ -29,10 +39,11 @@
 /var/log/ip-acct/*
 /var/log/rrd/*
 /var/log/rrd/collectd
-/var/log/rrd/vnstat
+/var/log/vnstat
 /etc/sysconfig/firewall.local
 /etc/sysconfig/rc.local
 /root/.gitconfig
 /root/.bash_history
 /var/ipfire/ethernet/aliases
 /var/ipfire/ethernet/wireless
+/var/ipfire/captive/*