Revert "Blackhole unreachable Amazon IPv6 block on equinix machines"

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

diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index 557440ff412c910e5dd9cbe26a10fb354337c31a..bc6159666e79bac886e06f3c70bc21ca4faf4843 100644 (file)
--- a/cookbooks/blog/templates/default/backup.cron.erb
+++ b/cookbooks/blog/templates/default/backup.cron.erb
@@ -10,13 +10,12 @@ mkdir $T/osm-blog-$D
 echo '[mysqldump]' > $T/mysqldump.opts
 echo 'user=osm-blog-user' >> $T/mysqldump.opts
 echo 'password=<%= @passwords["osm-blog-user"] %>' >> $T/mysqldump.opts
 echo '[mysqldump]' > $T/mysqldump.opts
 echo 'user=osm-blog-user' >> $T/mysqldump.opts
 echo 'password=<%= @passwords["osm-blog-user"] %>' >> $T/mysqldump.opts

-mysqldump --defaults-file=$T/mysqldump.opts --opt osm-blog > $T/osm-blog-$D/osm-blog.sql
+mysqldump --defaults-file=$T/mysqldump.opts --opt --no-tablespaces osm-blog > $T/osm-blog-$D/osm-blog.sql

 ln -s /srv/blog.openstreetmap.org $T/osm-blog-$D/www
 
 ln -s /srv/blog.openstreetmap.org $T/osm-blog-$D/www
 

-export GZIP="--rsyncable -9"

 export RSYNC_RSH="ssh -ax"
 
 export RSYNC_RSH="ssh -ax"
 

-nice tar --create --gzip --dereference --directory=$T --warning=no-file-changed --file=$T/$B osm-blog-$D
+nice tar --create --dereference --directory=$T --warning=no-file-changed osm-blog-$D | nice gzip --rsyncable -9 > $T/$B

 nice rsync --preallocate --fuzzy $T/$B backup::backup
 
 rm -rf $T
 nice rsync --preallocate --fuzzy $T/$B backup::backup
 
 rm -rf $T