supybot: more aggressive init stop

[chef.git] / cookbooks / donate / recipes / default.rb

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index bf1d46419f236d13f0b9a1136036eb65c2b14950..b354a335aa5bf578ba72b6cdc50729a7ec2a24af 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -78,7 +78,8 @@ template "/srv/donate.openstreetmap.org/scripts/db-connect.inc.php" do
   source "db-connect.inc.php.erb"
   owner "root"
   group "donate"
-  mode 0o640
+  mode 0o644
+  variables :passwords => passwords
 end
 
 apache_site "donate.openstreetmap.org" do
@@ -90,7 +91,7 @@ template "/etc/cron.d/osmf-donate" do
   owner "root"
   group "root"
   mode 0o600
-  variables :database_password => database_password
+  variables :passwords => passwords
 end
 
 template "/etc/cron.daily/osmf-donate-backup" do
@@ -98,5 +99,5 @@ template "/etc/cron.daily/osmf-donate-backup" do
   owner "root"
   group "root"
   mode 0o750
-  variables :database_password => database_password
+  variables :passwords => passwords
 end