Merge remote-tracking branch 'origin/next'

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

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index d2e5312526bfa8f9a18523573b80dc20e9da4e3a..8dffbf2e13ebe2a347c567058353a5f1ada64dbd 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -57,12 +57,21 @@ make_backup() {
                make_addon_backup "${addon}"
        done
 
-       tar cvzf "${filename}" \
+       # Backup using global exclude/include definitions
+       tar cvf "${filename}" \
                --exclude-from="/var/ipfire/backup/exclude" \
+               $(process_includes "/var/ipfire/backup/include") \
+               "$@"
+
+       # Backup using user exclude/include definitions and append to global backup
+       tar rvf "${filename}" \
                --exclude-from="/var/ipfire/backup/exclude.user" \
-               $(process_includes "/var/ipfire/backup/include" "/var/ipfire/backup/include.user") \
+               $(process_includes "/var/ipfire/backup/include.user") \
                "$@"
 
+       # gzip the combined global/user backup and use .ipf suffix
+       gzip --suffix .ipf "${filename}"
+
        return 0
 }
 
@@ -206,7 +215,7 @@ main() {
                        local filename="${1}"
 
                        if [ -z "${filename}" ]; then
-                               filename="/var/ipfire/backup/${NOW}.ipf"
+                               filename="/var/ipfire/backup/${NOW}"
                        fi
 
                        make_backup "${filename}" $(find_logfiles)
@@ -216,7 +225,7 @@ main() {
                        local filename="${1}"
 
                        if [ -z "${filename}" ]; then
-                               filename="/var/ipfire/backup/${NOW}.ipf"
+                               filename="/var/ipfire/backup/${NOW}"
                        fi
 
                        make_backup "${filename}"