Drop use of sender callout verification completely

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index dea088bb66a8b48263fe19788da8b96a9c534121..9c0b62ab7d61aa0a6b6d59177c09540cbfa34e50 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,8 +29,13 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
+sources_template = case node[:lsb][:release].to_f
+  when 12.10 then "old-sources.list.erb"
+  else "sources.list.erb"
+end
+
 template "/etc/apt/sources.list" do
-  source "sources.list.erb"
+  source sources_template
   owner "root"
   group "root"
   mode 0644
@@ -72,19 +77,13 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
-if node[:lsb][:release].to_f < 14.04
+if node[:lsb][:release].to_f == 12.04
   apt_source "openstreetmap" do
     url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
     key "0AC4F2CB"
   end
 end
 
-apt_source "proliant-support-pack" do
-  template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack"
-  key "2689B887"
-end
-
 apt_source "management-component-pack" do
   template "hp.list.erb"
   url "http://downloads.linux.hp.com/SDR/downloads/ManagementComponentPack"
@@ -113,3 +112,8 @@ apt_source "elasticsearch" do
   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