X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/86a29665df0d85ab17a421debd7c16e8216dc688..779425cb8af88572c56d6391ac4b86b9f1aa896d:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 47bd0ad18..96203cd4d 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -48,8 +48,8 @@ if platform?("debian")
   archive_security_host = archive_host
   archive_distro = "debian"
   archive_security_distro = "debian-security"
-  archive_suites = %w[main updates security]
-  archive_components = %w[main contrib non-free]
+  archive_suites = %w[main updates backports security]
+  archive_components = %w[main contrib non-free non-free-firmware]
 elsif intel?
   archive_host = if node[:country]
                    "#{node[:country]}.archive.ubuntu.com"
@@ -86,8 +86,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"