Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

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

diff --git a/config/backup/include b/config/backup/include
index 59430c576ce8b19d8e8ab647d3b70636529080cc..1190eda81edc3a39c919ec98697ae65f30a1bb99 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -1,49 +1,59 @@
-/var/ipfire/*/settings
-/var/ipfire/*/*.conf
-/var/ipfire/*/*.pem
-/var/ipfire/*/config
-/var/ipfire/*/enable
-/var/ipfire/*/*enable*
-/var/ipfire/ovpn/collectd.vpn
-/etc/unbound
-/etc/passwd
-/etc/shadow
+/etc/conntrackd/conntrackd.conf
 /etc/group
-/etc/ipsec.user.*
-/etc/ipsec.user-post.conf
-/etc/sysconfig/*
 /etc/hosts*
 /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/httpd/server.key
+/etc/ipsec.user.*
+/etc/ipsec.user-post.conf
 /etc/logrotate.d
+/etc/passwd
+/etc/shadow
+/etc/ssh/sshd_config
+/etc/ssh/ssh_host*
+/etc/squid/squid.conf.local
+/etc/squid/squid.conf.pre.local
+/etc/sysconfig/*
+/etc/sysconfig/firewall.local
+/etc/sysconfig/rc.local
+/etc/unbound
+/root/.bash_history
+/root/.gitconfig
+/root/.ssh
 /var/ipfire/auth/users
+/var/ipfire/backup/addons/backup
+/var/ipfire/backup/exclude.user
+/var/ipfire/backup/include.user
+/var/ipfire/captive/*
+/var/ipfire/*/*.conf
+/var/ipfire/*/config
 /var/ipfire/dhcp/*
 /var/ipfire/dnsforward/*
+/var/ipfire/*/enable
+/var/ipfire/*/*enable*
+/var/ipfire/ethernet/aliases
+/var/ipfire/ethernet/wireless
 /var/ipfire/firewall
 /var/ipfire/fwhosts
 /var/ipfire/main/*
 /var/ipfire/ovpn
+/var/ipfire/ovpn/collectd.vpn
+/var/ipfire/*/*.pem
 /var/ipfire/ppp
 /var/ipfire/proxy
 /var/ipfire/qos/*
 /var/ipfire/qos/bin/qos.sh
+/var/ipfire/suricata/*.conf
+/var/ipfire/suricata/*.yaml
+/var/ipfire/*/settings
 /var/ipfire/time/
 /var/ipfire/urlfilter
 /var/ipfire/vpn
+/var/lib/suricata
 /var/log/ip-acct/*
 /var/log/rrd/*
 /var/log/rrd/collectd
 /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/*