PassengerUseGlobalQueue defaults to on with passenger 4

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index c004043ef9c7068dfe498f6a6c87d7bbb6555c0e..1b48ddfda4b5ae0b6cf89f23014f207b555d62ba 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -37,12 +37,6 @@ template "/etc/apt/sources.list" do
   notifies :run, "execute[apt-update]"
 end
 
   notifies :run, "execute[apt-update]"
 end
 

-apt_source "opscode" do
-  template "opscode.list.erb"
-  url "http://apt.opscode.com/"
-  key "83EF826A"
-end
-

 apt_source "brightbox" do
   url "http://apt.brightbox.net/"
   key "0090DAAD"
 apt_source "brightbox" do
   url "http://apt.brightbox.net/"
   key "0090DAAD"


@@ -78,9 +72,11 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
   key "8D0DC64F"
 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


@@ -117,3 +113,8 @@ apt_source "elasticsearch" do
   url "http://packages.elasticsearch.org/elasticsearch/1.0/debian"
   key "D88E42B4"
 end
   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