From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 21 Aug 2018 10:32:04 +0000 (+0100)
Subject: backup: Order incldue/exclude alphabetically
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7486e30eebc5f7d6f456274ac82191987135f2e1;p=people%2Fms%2Fipfire-2.x.git

backup: Order incldue/exclude alphabetically

Nothing has been added or removed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/backup/exclude b/config/backup/exclude
index 7ca9d10b2d..0d3de04d25 100644
--- a/config/backup/exclude
+++ b/config/backup/exclude
@@ -1,5 +1,5 @@
-*.tmp
 /etc/sysconfig/lm_sensors
+*.tmp
 /var/ipfire/ethernet/settings
 /var/ipfire/firewall/bin/*
 /var/ipfire/ovpn/openssl/*
diff --git a/config/backup/include b/config/backup/include
index 59430c576c..fc9a6a57ea 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -1,38 +1,45 @@
-/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/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/sysconfig/*
+/etc/sysconfig/firewall.local
+/etc/sysconfig/rc.local
+/etc/unbound
+/root/.bash_history
+/root/.gitconfig
 /var/ipfire/auth/users
+/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/*/settings
 /var/ipfire/time/
 /var/ipfire/urlfilter
 /var/ipfire/vpn
@@ -40,10 +47,3 @@
 /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/*