tilecache: remove trogdor as peer from angor

[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 83421ff0ff5fadc983c526aeb1c8f26df2e803f0..61bb4cd453898600d7414bddc15268004a6ed591 100644 (file)
--- a/cookbooks/civicrm/templates/default/backup.cron.erb
+++ b/cookbooks/civicrm/templates/default/backup.cron.erb
@@ -7,13 +7,16 @@ D=$(date +%Y-%m-%d)
 B=osmf-crm-$D.tar.gz
 
 mkdir $T/osmf-crm-$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 /srv/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 civicrm > $T/osmf-crm-$D/civicrm.sql
+ln -s /srv/join.osmfoundation.org $T/osmf-crm-$D/www

 
 export GZIP="--rsyncable -9"
 
 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 tar --create --gzip --dereference --directory=$T --file=$T/$B osmf-crm-$D

-nice rsync $T/$B backup::backup
+nice rsync --preallocate --fuzzy $T/$B backup::backup

 
 rm -rf $T
 
 rm -rf $T