Use 12.04 chef packages on 12.10

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index f8098faecd7c22b88e946d44ee2288a416429a47..7c3dcfac05f4a15d0db6be1f84d33314af8f220e 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,6 +20,7 @@
 require "yaml"
 
 include_recipe "apache"
 require "yaml"
 
 include_recipe "apache"

+include_recipe "passenger"

 include_recipe "git"
 include_recipe "mysql"
 include_recipe "postgresql"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "postgresql"


@@ -47,21 +48,14 @@ package "python-dateutil"
 package "python-magic"
 package "python-psycopg2"
 
 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 "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
 gem_package "sqlite3"
 
 gem_package "rails" do


@@ -152,7 +146,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
     end
 
     rails_port site_name do
     end
 
     rails_port site_name do

-      ruby node[:dev][:ruby]
+      ruby node[:passenger][:ruby_version]

       directory rails_directory
       user "apis"
       group "apis"
       directory rails_directory
       user "apis"
       group "apis"