Bump cookstyle from 6.15.5 to 6.15.9

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

diff --git a/cookbooks/donate/templates/default/backup.cron.erb b/cookbooks/donate/templates/default/backup.cron.erb
index 139c1a3fe240779fb84f128e7f49ee1d5e38cfea..cf7e114b4e2ceaa598a5536568c1d6ed56302e3d 100644 (file)
--- a/cookbooks/donate/templates/default/backup.cron.erb
+++ b/cookbooks/donate/templates/default/backup.cron.erb
@@ -7,13 +7,15 @@ D=$(date +%Y-%m-%d)
 B=osm-donate-$D.tar.gz
 
 mkdir $T/osm-donate-$D
 B=osm-donate-$D.tar.gz
 
 mkdir $T/osm-donate-$D

-mysqldump --user=donate --password="<%= @passwords['database'] %>" --opt donate > $T/osm-donate-$D/osm-donate.sql
+echo '[mysqldump]' > $T/mysqldump.opts
+echo 'user=donate' >> $T/mysqldump.opts
+echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts
+mysqldump --defaults-file=$T/mysqldump.opts --opt donate > $T/osm-donate-$D/osm-donate.sql

 ln -s /srv/donate.openstreetmap.org $T/osm-donate-$D/www
 
 ln -s /srv/donate.openstreetmap.org $T/osm-donate-$D/www
 

-export GZIP="--rsyncable -9"

 export RSYNC_RSH="ssh -ax"
 
 export RSYNC_RSH="ssh -ax"
 

-nice tar --create --gzip --dereference --directory=$T --file=$T/$B osm-donate-$D
-nice rsync $T/$B backup::backup
+nice tar --create --dereference --directory=$T osm-donate-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup

 
 rm -rf $T
 
 rm -rf $T