From: Tom Hughes <tom@compton.nu>
Date: Mon, 17 Oct 2016 18:35:48 +0000 (+0100)
Subject: Enable backups for the forum
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1dc06e393c0cbd6dc086ac7f333caed7974096da

Enable backups for the forum
---

diff --git a/cookbooks/forum/templates/default/backup.cron.erb b/cookbooks/forum/templates/default/backup.cron.erb
index 41119794e..ec30196d3 100644
--- a/cookbooks/forum/templates/default/backup.cron.erb
+++ b/cookbooks/forum/templates/default/backup.cron.erb
@@ -1,5 +1,4 @@
 #!/bin/sh
-exit 0
 
 # DO NOT EDIT - This file is being maintained by Chef
 
@@ -8,7 +7,10 @@ D=$(date +%Y-%m-%d)
 B=forum-$D.tar.gz
 
 mkdir $T/forum-$D
-mysqldump --user=forum --password=<%= @passwords["database"] %> --opt forum > $T/forum-$D/forum.sql
+echo '[mysqldump]' > $T/mysqldump.opts
+echo 'user=forum' >> $T/mysqldump.opts
+echo 'password=<%= @passwords["database"] %>' >> $T/mysqldump.opts
+mysqldump --defaults-file=$T/mysqldump.opts --opt forum > $T/forum-$D/forum.sql
 ln -s /srv/forum.openstreetmap.org $T/forum-$D/www
 
 export GZIP="--rsyncable -9"