Add support for passenger 4 using the phusion repos

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index d3ec6e4c5626c4faa197a84d7a409de7c8ea5e48..1b48ddfda4b5ae0b6cf89f23014f207b555d62ba 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -34,13 +34,7 @@ template "/etc/apt/sources.list" do
   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

-  notifies :run, resources(:execute => "apt-update")
-end
-
-apt_source "opscode" do
-  template "opscode.list.erb"
-  url "http://apt.opscode.com/"
-  key "83EF826A"
+  notifies :run, "execute[apt-update]"

 end
 
 apt_source "brightbox" do
 end
 
 apt_source "brightbox" do


@@ -78,14 +72,11 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
   key "8D0DC64F"
 end
 

-apt_source "aw-drupal" do
-  url "http://ppa.launchpad.net/aw/drupal/ubuntu"
-  key "7D5AE8F6"
-end
-
-apt_source "openstreetmap" do
-  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "0AC4F2CB"
+if node[:lsb][:release].to_f < 14.04
+  apt_source "openstreetmap" do
+    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+    key "0AC4F2CB"
+  end

 end
 
 apt_source "proliant-support-pack" do
 end
 
 apt_source "proliant-support-pack" do


@@ -101,6 +92,7 @@ apt_source "management-component-pack" do
 end
 
 apt_source "hwraid" do
 end
 
 apt_source "hwraid" do

+  template "hwraid.list.erb"

   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end
   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end


@@ -109,3 +101,20 @@ apt_source "mapnik-v210" do
   url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
   key "5D50B6BA"
 end
   url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
   key "5D50B6BA"
 end

+
+apt_source "nginx" do
+  template "nginx.list.erb"
+  url "http://nginx.org/packages/ubuntu"
+  key "7BD9BF62"
+end
+
+apt_source "elasticsearch" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/1.0/debian"
+  key "D88E42B4"
+end
+
+apt_source "passenger" do
+  url "https://oss-binaries.phusionpassenger.com/apt/passenger"
+  key "AC40B2F7"
+end