X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8eb2c1d74e2a81950469412a4b73d9c31a08a8fa..eb1f896a0237db83aa4cf3c2ecd9a9a77e681fda:/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 45aafad26..a8e1da21c 100644
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -8,7 +8,7 @@ B=sotm-$D.tar.gz
 
 mkdir $T/sotm-$D
 
-<% 2007.upto(2012) do |year| -%>
+<% %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
 <% end -%>
 
@@ -18,10 +18,12 @@ 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/2016.stateofthemap.org $T/sotm-$D/www2016
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B sotm-$D
-nice nice $T/$B backup::backup
+nice rsync $T/$B backup::backup
 
 rm -rf $T