From: Tom Hughes <tom@compton.nu>
Date: Sun, 23 Jun 2013 18:43:24 +0000 (+0100)
Subject: Fix typos
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e5b3edcc1681db80533f35c67b5c3f1c0d2e866e

Fix typos
---

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 116f5c8be..28e2d7779 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -162,5 +162,5 @@ template "/etc/cron.daily/osmf-crm-backup" do
   owner "root"
   group "root"
   mode 0750
-  variable :passwords => passwords
+  variables :passwords => passwords
 end
diff --git a/cookbooks/foundation/recipes/default.rb b/cookbooks/foundation/recipes/default.rb
index 2f9b98849..366f8a695 100644
--- a/cookbooks/foundation/recipes/default.rb
+++ b/cookbooks/foundation/recipes/default.rb
@@ -54,5 +54,5 @@ template "/etc/cron.daily/blog-backup" do
   owner "root"
   group "root"
   mode 0750
-  variable :passwords => passwords
+  variables :passwords => passwords
 end
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 58258be93..8b2657416 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -234,5 +234,5 @@ template "/etc/cron.daily/sotm-backup" do
   owner "root"
   group "root"
   mode 0750
-  variable :passwords => passwords
+  variables :passwords => passwords
 end
diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb
index 45aafad26..e78b50348 100644
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -22,6 +22,6 @@ ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012
 export GZIP="--rsyncable -9"
 
 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
diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 467f2b7b4..c0551a499 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -40,5 +40,5 @@ template "/etc/cron.daily/switch2osm-backup" do
   owner "root"
   group "root"
   mode 0750
-  variable :passwords => passwords
+  variables :passwords => passwords
 end
diff --git a/cookbooks/thinkup/recipes/default.rb b/cookbooks/thinkup/recipes/default.rb
index 09b49db2e..90992ac14 100644
--- a/cookbooks/thinkup/recipes/default.rb
+++ b/cookbooks/thinkup/recipes/default.rb
@@ -120,5 +120,5 @@ template "/etc/cron.daily/thinkup-backup" do
   owner "root"
   group "root"
   mode 0750
-  variable :passwords => passwords
+  variables :passwords => passwords
 end
diff --git a/cookbooks/thinkup/templates/default/backup.cron.erb b/cookbooks/thinkup/templates/default/backup.cron.erb
index b5b6c75bb..ecdba2ec4 100644
--- a/cookbooks/thinkup/templates/default/backup.cron.erb
+++ b/cookbooks/thinkup/templates/default/backup.cron.erb
@@ -7,7 +7,7 @@ D=$(date +%Y-%m-%d)
 B=thinkup-$D.tar.gz
 
 mkdir $T/thinkup-$D
-mysqldump --user=thinkup --password=<% @passwords["database"] %> --opt thinkup > $T/thinkup-$D/thinkup.sql
+mysqldump --user=thinkup --password=<%= @passwords["database"] %> --opt thinkup > $T/thinkup-$D/thinkup.sql
 ln -s /srv/thinkup.openstreetmap.org $T/thinkup-$D/www
 
 export GZIP="--rsyncable -9"