Update bundle

[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..e0f4d87bae534bd939006b8ea9a75460e9a879aa 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -8,8 +8,11 @@ B=sotm-$D.tar.gz
 
 mkdir $T/sotm-$D
 
 
 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
+<% %w(2007 2008 2009 2010 2011 2012).each do |year| -%>
+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 --no-tablespaces 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


@@ -18,12 +21,10 @@ ln -s /srv/2009.stateofthemap.org $T/sotm-$D/www2009
 ln -s /srv/2010.stateofthemap.org $T/sotm-$D/www2010
 ln -s /srv/2011.stateofthemap.org $T/sotm-$D/www2011
 ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012
 ln -s /srv/2010.stateofthemap.org $T/sotm-$D/www2010
 ln -s /srv/2011.stateofthemap.org $T/sotm-$D/www2011
 ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012

-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 rsync $T/$B backup::backup
+nice tar --create --dereference --directory=$T sotm-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup

 
 rm -rf $T
 
 rm -rf $T