backup: Make include/exclude files relative

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-03-04 10:41:30 +00:00
parent 3f8e70f6b3
commit c7e0d73e7c
3 changed files with 74 additions and 74 deletions

View File

@@ -39,7 +39,7 @@ process_includes() {
local file local file
while read -r file; do while read -r file; do
for file in ${file}; do for file in ${file}; do
if [ -e "${file}" ]; then if [ -e "/${file}" ]; then
echo "${file}" echo "${file}"
fi fi
done done
@@ -58,7 +58,7 @@ make_backup() {
done done
# Backup using global exclude/include definitions # Backup using global exclude/include definitions
tar cvfz "${filename}" \ tar cvfz "${filename}" -C / \
--exclude-from="/var/ipfire/backup/exclude" \ --exclude-from="/var/ipfire/backup/exclude" \
--exclude-from="/var/ipfire/backup/exclude.user" \ --exclude-from="/var/ipfire/backup/exclude.user" \
$(process_includes "/var/ipfire/backup/include") \ $(process_includes "/var/ipfire/backup/include") \

View File

@@ -1,10 +1,10 @@
/etc/sysconfig/lm_sensors etc/sysconfig/lm_sensors
/etc/unbound/unbound.conf etc/unbound/unbound.conf
*.tmp *.tmp
/var/ipfire/ethernet/settings var/ipfire/ethernet/settings
/var/ipfire/firewall/bin/* var/ipfire/firewall/bin/*
/var/ipfire/ovpn/openssl/* var/ipfire/ovpn/openssl/*
/var/ipfire/proxy/calamaris/bin/* var/ipfire/proxy/calamaris/bin/*
/var/ipfire/qos/bin/qos.pl var/ipfire/qos/bin/qos.pl
/var/ipfire/suricata/oinkmaster.conf var/ipfire/suricata/oinkmaster.conf
/var/ipfire/urlfilter/blacklists/*/*.db var/ipfire/urlfilter/blacklists/*/*.db

View File

@@ -1,63 +1,63 @@
/etc/conntrackd/conntrackd.conf etc/conntrackd/conntrackd.conf
/etc/group etc/group
/etc/hosts* etc/hosts*
/etc/httpd/server.crt etc/httpd/server.crt
/etc/httpd/server.csr etc/httpd/server.csr
/etc/httpd/server-ecdsa.crt etc/httpd/server-ecdsa.crt
/etc/httpd/server-ecdsa.csr etc/httpd/server-ecdsa.csr
/etc/httpd/server-ecdsa.key etc/httpd/server-ecdsa.key
/etc/httpd/server.key etc/httpd/server.key
/etc/ipsec.user.* etc/ipsec.user.*
/etc/ipsec.user-post.conf etc/ipsec.user-post.conf
/etc/logrotate.d etc/logrotate.d
/etc/passwd etc/passwd
/etc/shadow etc/shadow
/etc/ssh/sshd_config etc/ssh/sshd_config
/etc/ssh/ssh_host* etc/ssh/ssh_host*
/etc/squid/squid.conf.local etc/squid/squid.conf.local
/etc/squid/squid.conf.pre.local etc/squid/squid.conf.pre.local
/etc/sysconfig/* etc/sysconfig/*
/etc/sysconfig/firewall.local etc/sysconfig/firewall.local
/etc/sysconfig/rc.local etc/sysconfig/rc.local
/etc/unbound etc/unbound
/root/.bash_history root/.bash_history
/root/.gitconfig root/.gitconfig
/root/.ssh root/.ssh
/var/ipfire/auth/users var/ipfire/auth/users
/var/ipfire/backup/addons/backup var/ipfire/backup/addons/backup
/var/ipfire/backup/exclude.user var/ipfire/backup/exclude.user
/var/ipfire/backup/include.user var/ipfire/backup/include.user
/var/ipfire/captive/* var/ipfire/captive/*
/var/ipfire/*/*.conf var/ipfire/*/*.conf
/var/ipfire/*/config var/ipfire/*/config
/var/ipfire/dhcp/* var/ipfire/dhcp/*
/var/ipfire/dns var/ipfire/dns
/var/ipfire/dnsforward/* var/ipfire/dnsforward/*
/var/ipfire/*/enable var/ipfire/*/enable
/var/ipfire/*/*enable* var/ipfire/*/*enable*
/var/ipfire/ethernet/aliases var/ipfire/ethernet/aliases
/var/ipfire/ethernet/wireless var/ipfire/ethernet/wireless
/var/ipfire/firewall var/ipfire/firewall
/var/ipfire/fwhosts var/ipfire/fwhosts
/var/ipfire/main/* var/ipfire/main/*
/var/ipfire/ovpn var/ipfire/ovpn
/var/ipfire/ovpn/collectd.vpn var/ipfire/ovpn/collectd.vpn
/var/ipfire/*/*.pem var/ipfire/*/*.pem
/var/ipfire/ppp var/ipfire/ppp
/var/ipfire/proxy var/ipfire/proxy
/var/ipfire/qos/* var/ipfire/qos/*
/var/ipfire/qos/bin/qos.sh var/ipfire/qos/bin/qos.sh
/var/ipfire/suricata/*.conf var/ipfire/suricata/*.conf
/var/ipfire/suricata/*.yaml var/ipfire/suricata/*.yaml
/var/ipfire/suricata/providers-settings var/ipfire/suricata/providers-settings
/var/ipfire/*/settings var/ipfire/*/settings
/var/ipfire/time/ var/ipfire/time/
/var/ipfire/urlfilter var/ipfire/urlfilter
/var/ipfire/vpn var/ipfire/vpn
/var/lib/suricata var/lib/suricata
/var/log/ip-acct/* var/log/ip-acct/*
/var/log/rrd/* var/log/rrd/*
/var/log/rrd/collectd var/log/rrd/collectd
/var/log/vnstat var/log/vnstat
/var/tmp/idsrules-*.tar.gz var/tmp/idsrules-*.tar.gz
/var/tmp/idsrules-*.rules var/tmp/idsrules-*.rules