Avoid passing mysqldump passwords on the command line

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

diff --git a/cookbooks/donate/templates/default/backup.cron.erb b/cookbooks/donate/templates/default/backup.cron.erb
index 139c1a3fe240779fb84f128e7f49ee1d5e38cfea..7ff3ee08aa6413d7e453eb45f63c3c7e0a0fd6ee 100644 (file)
--- a/cookbooks/donate/templates/default/backup.cron.erb
+++ b/cookbooks/donate/templates/default/backup.cron.erb
@@ -7,7 +7,10 @@ D=$(date +%Y-%m-%d)
 B=osm-donate-$D.tar.gz
 
 mkdir $T/osm-donate-$D
 B=osm-donate-$D.tar.gz
 
 mkdir $T/osm-donate-$D

-mysqldump --user=donate --password="<%= @passwords['database'] %>" --opt donate > $T/osm-donate-$D/osm-donate.sql
+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

 ln -s /srv/donate.openstreetmap.org $T/osm-donate-$D/www
 
 export GZIP="--rsyncable -9"
 ln -s /srv/donate.openstreetmap.org $T/osm-donate-$D/www
 
 export GZIP="--rsyncable -9"