Don't try and dump tablespaces in mysql backups

diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index 59e91f752217d719dfbc6932d6d1212650a32caf..bc6159666e79bac886e06f3c70bc21ca4faf4843 100644 (file)
--- a/cookbooks/blog/templates/default/backup.cron.erb
+++ b/cookbooks/blog/templates/default/backup.cron.erb
@@ -10,7 +10,7 @@ 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
 
 export RSYNC_RSH="ssh -ax"
 ln -s /srv/blog.openstreetmap.org $T/osm-blog-$D/www
 
 export RSYNC_RSH="ssh -ax"

diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb
index 21d85753a3a15d2c2697e352f4326455015425a1..29fc2ba1b4b891d4e440cc8121a230a2bafc151e 100644 (file)
--- a/cookbooks/civicrm/templates/default/backup.cron.erb
+++ b/cookbooks/civicrm/templates/default/backup.cron.erb
@@ -10,7 +10,7 @@ mkdir $T/osmf-crm-$D
 echo '[mysqldump]' > $T/mysqldump.opts
 echo 'user=civicrm' >> $T/mysqldump.opts
 echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts
 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
+mysqldump --defaults-file=$T/mysqldump.opts --opt --skip-lock-tables --no-tablespaces civicrm > $T/osmf-crm-$D/civicrm.sql

 ln -s /srv/join.osmfoundation.org $T/osmf-crm-$D/www
 
 export RSYNC_RSH="ssh -ax"
 ln -s /srv/join.osmfoundation.org $T/osmf-crm-$D/www
 
 export RSYNC_RSH="ssh -ax"

diff --git a/cookbooks/donate/templates/default/backup.cron.erb b/cookbooks/donate/templates/default/backup.cron.erb
index cf7e114b4e2ceaa598a5536568c1d6ed56302e3d..3782762c339182ad5f8a2eee18f5b626823cc670 100644 (file)
--- a/cookbooks/donate/templates/default/backup.cron.erb
+++ b/cookbooks/donate/templates/default/backup.cron.erb
@@ -10,7 +10,7 @@ mkdir $T/osm-donate-$D
 echo '[mysqldump]' > $T/mysqldump.opts
 echo 'user=donate' >> $T/mysqldump.opts
 echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts
 echo '[mysqldump]' > $T/mysqldump.opts
 echo 'user=donate' >> $T/mysqldump.opts
 echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts

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

 ln -s /srv/donate.openstreetmap.org $T/osm-donate-$D/www
 
 export RSYNC_RSH="ssh -ax"
 ln -s /srv/donate.openstreetmap.org $T/osm-donate-$D/www
 
 export RSYNC_RSH="ssh -ax"

diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb
index 0b459d52cc9562b93324d07476cdebb5528c328e..20ff1588854af2be8ef08dcca12af29145d2a99f 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -12,7 +12,7 @@ mkdir $T/sotm-$D
 echo '[mysqldump]' > $T/mysqldump.opts
 echo 'user=sotm<%= year %>' >> $T/mysqldump.opts
 echo 'password=<%= @passwords["sotm#{year}"] %>' >> $T/mysqldump.opts
 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
+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