Drop old cleanup code

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 4cd4b79262f14bd95adcaa6b3f3d6475285a00b5..75fa4147a51c07cf2003108afa55c1a7c51af1d1 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,11 +29,6 @@ file "/etc/motd.tail" do
   action :delete
 end
 
-# FIXME: cleanup old package pin method for cciss-vol-status
-file "/etc/apt/preferences.d/99-chef" do
-  action :delete
-end
-
 apt_preference "cciss-vol-status" do
   pin          "origin *.ubuntu.com"
   pin_priority "1100"
@@ -48,7 +43,7 @@ if platform?("debian")
   archive_security_host = archive_host
   archive_distro = "debian"
   archive_security_distro = "debian-security"
-  archive_suites = %w[main updates security]
+  archive_suites = %w[main updates backports security]
   archive_components = %w[main contrib non-free non-free-firmware]
 elsif intel?
   archive_host = if node[:country]
@@ -86,8 +81,9 @@ template "/etc/apt/sources.list" do
 end
 
 apt_repository "openstreetmap" do
-  uri "ppa:osmadmins/ppa"
-  only_if { platform?("ubuntu") }
+  uri "https://apt.openstreetmap.org"
+  components ["main"]
+  key "https://apt.openstreetmap.org/gpg.key"
 end
 
 package "unattended-upgrades"