Avoid use of deprecated GZIP environment variable

[chef.git] / cookbooks / forum / templates / default / backup.cron.erb

diff --git a/cookbooks/forum/templates/default/backup.cron.erb b/cookbooks/forum/templates/default/backup.cron.erb
index 31fd20563b2fb200620c9a6536a64f0a4042cc1e..db4f0b412b7241f719485f4d57311c594a4b41f9 100644 (file)
--- a/cookbooks/forum/templates/default/backup.cron.erb
+++ b/cookbooks/forum/templates/default/backup.cron.erb
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0
 
 # DO NOT EDIT - This file is being maintained by Chef
 
@@ -8,13 +7,15 @@ D=$(date +%Y-%m-%d)
 B=forum-$D.tar.gz
 
 mkdir $T/forum-$D
-mysqldump --user=forum --password=<%= @passwords["database"] %> --opt forum > $T/forum-$D/forum.sql
+echo '[mysqldump]' > $T/mysqldump.opts
+echo 'user=forum' >> $T/mysqldump.opts
+echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts
+mysqldump --defaults-file=$T/mysqldump.opts --opt forum > $T/forum-$D/forum.sql
 ln -s /srv/forum.openstreetmap.org $T/forum-$D/www
 
-export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
-nice tar --create --gzip --dereference --directory=$T --file=$T/$B forum-$D
-nice rsync $T/$B backup::backup
+nice tar --create --dereference --directory=$T forum-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup
 
 rm -rf $T