X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3ae5b9b4fbb5a637df5a9e8138cd421e0c6e74e7..2915ebac652fcc0521325cf1aae5a2f56f792549:/cookbooks/civicrm/templates/default/backup.cron.erb?ds=sidebyside

diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb
index 4a5469ed4..29fc2ba1b 100644
--- 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
-ln -s /data/crm.osmfoundation.org $T/osmf-crm-$D/www
+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