Skip to content
Snippets Groups Projects
Commit f9672647 authored by intrigeri's avatar intrigeri
Browse files

ldap, mysql, pgsql: use gzip's --rsyncable option

parent 75d17d06
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,8 @@ version 0.9.7 -- UNRELEASED ...@@ -6,6 +6,8 @@ version 0.9.7 -- UNRELEASED
file or in a given backup action file. Thanks Tuomas Jormola for the file or in a given backup action file. Thanks Tuomas Jormola for the
preliminary patch (Closes: #511299) preliminary patch (Closes: #511299)
handler changes handler changes
ldap:
. Use gzip's --rsyncable option.
maildir: maildir:
. fix location of deleted_on file . fix location of deleted_on file
. add missing destid_file options to ssh connections . add missing destid_file options to ssh connections
...@@ -20,6 +22,9 @@ version 0.9.7 -- UNRELEASED ...@@ -20,6 +22,9 @@ version 0.9.7 -- UNRELEASED
does not prevent mysqldump to work. does not prevent mysqldump to work.
. Fix the error message displayed when mysqld is not running: . Fix the error message displayed when mysqld is not running:
mysqladmin ping indeed returns 0 when authentication fails. mysqladmin ping indeed returns 0 when authentication fails.
. Use gzip's --rsyncable option.
pgsql:
. Use gzip's --rsyncable option.
sys: sys:
. New luksheaders option (default=disabled) to backup the Luks header . New luksheaders option (default=disabled) to backup the Luks header
of every Luks device. of every Luks device.
......
...@@ -86,7 +86,7 @@ if [ "$ldif" == "yes" ]; then ...@@ -86,7 +86,7 @@ if [ "$ldif" == "yes" ]; then
fi fi
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="$execstr | $GZIP > $dumpdir/$dbsuffix.ldif.gz" execstr="$execstr | $GZIP --rsyncable > $dumpdir/$dbsuffix.ldif.gz"
else else
execstr="$execstr > $dumpdir/$dbsuffix.ldif" execstr="$execstr > $dumpdir/$dbsuffix.ldif"
fi fi
......
...@@ -272,7 +272,7 @@ then ...@@ -272,7 +272,7 @@ then
fatal "mysqld doesn't appear to be running!" fatal "mysqld doesn't appear to be running!"
fi fi
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="$VSERVER $vsname exec $DUMP | $GZIP > $vroot$dumpdir/${db}.sql.gz" execstr="$VSERVER $vsname exec $DUMP | $GZIP --rsyncable > $vroot$dumpdir/${db}.sql.gz"
else else
execstr="$VSERVER $vsname exec $DUMP -r $vroot$dumpdir/${db}.sql" execstr="$VSERVER $vsname exec $DUMP -r $vroot$dumpdir/${db}.sql"
fi fi
...@@ -283,7 +283,7 @@ then ...@@ -283,7 +283,7 @@ then
fatal "mysqld doesn't appear to be running!" fatal "mysqld doesn't appear to be running!"
fi fi
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="$DUMP | $GZIP > $dumpdir/${db}.sql.gz" execstr="$DUMP | $GZIP --rsyncable > $dumpdir/${db}.sql.gz"
else else
execstr="$DUMP -r $dumpdir/${db}.sql" execstr="$DUMP -r $dumpdir/${db}.sql"
fi fi
......
...@@ -75,13 +75,13 @@ chmod 700 $vroot$backupdir ...@@ -75,13 +75,13 @@ chmod 700 $vroot$backupdir
if [ "$databases" == "all" ]; then if [ "$databases" == "all" ]; then
if [ $usevserver = yes ]; then if [ $usevserver = yes ]; then
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${vsname}.sql.gz\"" execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL | $GZIP --rsyncable > $backupdir/${vsname}.sql.gz\""
else else
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\"" execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\""
fi fi
else else
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${localhost}-all.sql.gz\"" execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL | $GZIP --rsyncable > $backupdir/${localhost}-all.sql.gz\""
else else
execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\"" execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\""
fi fi
...@@ -104,13 +104,13 @@ else ...@@ -104,13 +104,13 @@ else
for db in $databases; do for db in $databases; do
if [ $usevserver = yes ]; then if [ $usevserver = yes ]; then
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\"" execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMP $db | $GZIP --rsyncable > $backupdir/${db}.sql.gz\""
else else
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\"" execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\""
fi fi
else else
if [ "$compress" == "yes" ]; then if [ "$compress" == "yes" ]; then
execstr="su - $PGSQLUSER -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\"" execstr="su - $PGSQLUSER -c \"$PGSQLDUMP $db | $GZIP --rsyncable > $backupdir/${db}.sql.gz\""
else else
execstr="su - $PGSQLUSER -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\"" execstr="su - $PGSQLUSER -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\""
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment