X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/c913da851887ef582b018000d618b36901b1c253..da1115e80fdbca939aa7b2f8b2027705f1c32b24:/cookbooks/dev/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index f8098faec..646b170e2 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"
@@ -53,15 +54,6 @@ 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
@@ -152,7 +144,7 @@ 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"