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 c4cd3acc3c8f4249d9e6386b014d4b069ec8f863..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,7 +77,7 @@ 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"