Remove attempt to force geodns rebuilds with --assume-new

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

diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb
index 30937d2cb8f23fb9ad6efcb6d688d31932172be6..cb7171b6f5dd82464c922b70849c0f69b93c15bd 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -9,7 +9,10 @@ B=sotm-$D.tar.gz
 mkdir $T/sotm-$D
 
 <% %w(2007 2008 2009 2010 2011 2012 2016).each do |year| -%>
 mkdir $T/sotm-$D
 
 <% %w(2007 2008 2009 2010 2011 2012 2016).each do |year| -%>

-mysqldump --user=sotm<%= year %> --password=<%= @passwords["sotm#{year}"] %> --opt sotm<%= year %> > $T/sotm-$D/sotm<%= year %>.sql
+echo '[mysqldump]' > $T/mysqldump.opts
+echo 'user=sotm<%= year %>' >> $T/mysqldump.opts
+echo 'password=<%= @passwords["sotm#{year}"] %>' >> $T/mysqldump.opts
+mysqldump --defaults-file=$T/mysqldump.opts --opt sotm<%= year %> > $T/sotm-$D/sotm<%= year %>.sql

 <% end -%>
 
 ln -s /srv/2007.stateofthemap.org $T/sotm-$D/www2007
 <% end -%>
 
 ln -s /srv/2007.stateofthemap.org $T/sotm-$D/www2007


@@ -21,9 +24,9 @@ ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012
 ln -s /srv/2016.stateofthemap.org $T/sotm-$D/www2016
 
 export GZIP="--rsyncable -9"
 ln -s /srv/2016.stateofthemap.org $T/sotm-$D/www2016
 
 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 sotm-$D
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B sotm-$D

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

 
 rm -rf $T
 
 rm -rf $T