X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/59df18a47e1431952fcf82ca8ab318c2566370dc..95e1e4603eb8c32acf8ee58c845ec4ce5bfdd56c:/cookbooks/thinkup/recipes/default.rb

diff --git a/cookbooks/thinkup/recipes/default.rb b/cookbooks/thinkup/recipes/default.rb
index 25864460f..c06feb7f9 100644
--- a/cookbooks/thinkup/recipes/default.rb
+++ b/cookbooks/thinkup/recipes/default.rb
@@ -50,7 +50,7 @@ git "/srv/thinkup.openstreetmap.org" do
   revision "v1.2.1"
   user "root"
   group "root"
-  notifies :reload, resources(:service => "apache2")
+  notifies :reload, "service[apache2]"
 end
 
 directory "/srv/thinkup.openstreetmap.org/logs" do
@@ -81,7 +81,7 @@ thinkup_config = edit_file "/srv/thinkup.openstreetmap.org/webapp/config.sample.
   line.gsub!(/^(\$THINKUP_CFG\['site_root_path'\] *=) '[^']*';$/, "\\1 '/';")
   line.gsub!(/^(\$THINKUP_CFG\['timezone'\] *=) '[^']*';$/, "\\1 'Europe/London';")
   line.gsub!(/^(\$THINKUP_CFG\['db_user'\] *=) '[^']*';$/, "\\1 'thinkup';")
-  line.gsub!(/^(\$THINKUP_CFG\['db_password'\] *=) '[^']*';$/, "\\1 '#{passwords["database"]}';")
+  line.gsub!(/^(\$THINKUP_CFG\['db_password'\] *=) '[^']*';$/, "\\1 '#{passwords['database']}';")
   line.gsub!(/^(\$THINKUP_CFG\['db_name'\] *=) '[^']*';$/, "\\1 'thinkup';")
 
   line
@@ -92,13 +92,13 @@ file "/srv/thinkup.openstreetmap.org/webapp/config.inc.php" do
   group "root"
   mode 0644
   content thinkup_config
-  notifies :reload, resources(:service => "apache2")
+  notifies :reload, "service[apache2]"
 end
 
 thinkup_cron = edit_file "/srv/thinkup.openstreetmap.org/extras/cron/config.sample" do |line|
   line.gsub!(/^thinkup="[^"]*"$/, "thinkup=\"/srv/thinkup.openstreetmap.org\"")
   line.gsub!(/^thinkup_username="[^"]*"$/, "thinkup_username=\"openstreetmap@jonno.cix.co.uk\"")
-  line.gsub!(/^thinkup_password="[^"]*"$/, "thinkup_password=\"#{passwords["admin"]}\"")
+  line.gsub!(/^thinkup_password="[^"]*"$/, "thinkup_password=\"#{passwords['admin']}\"")
   line.gsub!(/^php="[^"]*"$/, "php=\"/usr/bin/php\"")
   line.gsub!(/^#crawl_interval=[0-9]+$/, "crawl_interval=30")