X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3b5a6405d3dd3483fa8d77fa4924138c6287d10b..e5cfdc9914e4d57a2e7cb5cfb370eeb97683f745:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 39f99f6c7..7c3dcfac0 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,6 +20,7 @@
 require "yaml"
 
 include_recipe "apache"
+include_recipe "passenger"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "postgresql"
@@ -47,21 +48,14 @@ package "python-dateutil"
 package "python-magic"
 package "python-psycopg2"
 
+easy_install_package "geojson"
+
 apache_module "expires"
 apache_module "fastcgi-handler"
 apache_module "rewrite"
 apache_module "expires"
 apache_module "wsgi"
 
-apache_module "passenger" do
-  conf "passenger.conf.erb"
-end
-
-munin_plugin "passenger_memory"
-munin_plugin "passenger_processes"
-munin_plugin "passenger_queues"
-munin_plugin "passenger_requests"
-
 gem_package "sqlite3"
 
 gem_package "rails" do
@@ -78,12 +72,12 @@ template "/etc/php5/fpm/pool.d/default.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "php5-fpm")
+  notifies :reload, "service[php5-fpm]"
 end
 
 file "/etc/php5/fpm/pool.d/www.conf" do
   action :delete
-  notifies :reload, resources(:service => "php5-fpm")
+  notifies :reload, "service[php5-fpm]"
 end
 
 package "phppgadmin"
@@ -105,7 +99,7 @@ end
 
 search(:accounts, "*:*").each do |account|
   name = account["id"]
-  details = node[:accounts][:users][name]
+  details = node[:accounts][:users][name] || {}
 
   if ["user","administrator"].include?(details[:status])
     user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}"
@@ -117,7 +111,7 @@ search(:accounts, "*:*").each do |account|
         group "root"
         mode 0644
         variables :user => name
-        notifies :reload, resources(:service => "php5-fpm")
+        notifies :reload, "service[php5-fpm]"
       end
 
       apache_site "#{name}.dev.openstreetmap.org" do
@@ -129,7 +123,7 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
-if node[:postgresql][:clusters]["9.1/main"]
+if node[:postgresql][:clusters][:"9.1/main"]
   postgresql_user "apis" do
     cluster "9.1/main"
   end
@@ -152,13 +146,13 @@ if node[:postgresql][:clusters]["9.1/main"]
     end
 
     rails_port site_name do
-      ruby node[:dev][:ruby]
+      ruby node[:passenger][:ruby_version]
       directory rails_directory
       user "apis"
       group "apis"
       repository details[:repository]
       revision details[:revision]
-      database_port node[:postgresql][:clusters]["9.1/main"][:port]
+      database_port node[:postgresql][:clusters][:"9.1/main"][:port]
       database_name database_name
       database_username "apis"
       run_migrations true
@@ -170,7 +164,7 @@ if node[:postgresql][:clusters]["9.1/main"]
       group "apis"
       mode 0644
       variables :site => site_name
-      notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+      notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
     end
 
     apache_site site_name do