Ignore 509 bandwidth limit errors when computing error rates

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

diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb
index 9a215561670601be1e32b04b54def0382ec85598..29fc2ba1b4b891d4e440cc8121a230a2bafc151e 100644 (file)
--- a/cookbooks/civicrm/templates/default/backup.cron.erb
+++ b/cookbooks/civicrm/templates/default/backup.cron.erb
@@ -7,13 +7,15 @@ D=$(date +%Y-%m-%d)
 B=osmf-crm-$D.tar.gz
 
 mkdir $T/osmf-crm-$D
-mysqldump --user=civicrm --password=<%= @passwords["database"] %> --opt --skip-lock-tables civicrm > $T/osmf-crm-$D/civicrm.sql
+echo '[mysqldump]' > $T/mysqldump.opts
+echo 'user=civicrm' >> $T/mysqldump.opts
+echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts
+mysqldump --defaults-file=$T/mysqldump.opts --opt --skip-lock-tables --no-tablespaces civicrm > $T/osmf-crm-$D/civicrm.sql
 ln -s /srv/join.osmfoundation.org $T/osmf-crm-$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 osmf-crm-$D
-nice rsync $T/$B backup::backup
+nice tar --create --dereference --directory=$T osmf-crm-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup
 
 rm -rf $T