From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Nov 2023 10:20:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/641'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/e7687ba5011277801d8f0bc433fe192ba9c69ccc?ds=sidebyside;hp=-c

Merge remote-tracking branch 'github/pull/641'
---

e7687ba5011277801d8f0bc433fe192ba9c69ccc
diff --combined cookbooks/chef/recipes/default.rb
index 99f665541,befce968c..60511bf16
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@@ -33,6 -33,18 +33,18 @@@ chef_arch = if arm
                "amd64"
              end
  
+ os_release = if platform?("debian") && node[:lsb][:release].to_f > 11
+                11
+              else
+                node[:lsb][:release]
+              end
+ 
+ # Chef is currently not available for Debian 11 on arm64.
+ if chef_platform == "debian" && os_release == 11 && chef_arch == "arm64"
+   chef_platform = "ubuntu"
+   os_release = "22.04"
+ end
+ 
  chef_package = "chef_#{chef_version}-1_#{chef_arch}.deb"
  
  directory "/var/cache/chef" do
@@@ -49,12 -61,6 +61,6 @@@ Dir.glob("#{cache_dir}/chef_*.deb").eac
    end
  end
  
- os_release = if platform?("debian") && node[:lsb][:release].to_f > 11
-                11
-              else
-                node[:lsb][:release]
-              end
- 
  remote_file "#{cache_dir}/#{chef_package}" do
    source "https://packages.chef.io/files/stable/chef/#{chef_version}/#{chef_platform}/#{os_release}/#{chef_package}"
    owner "root"
@@@ -102,9 -108,17 +108,9 @@@ template "/etc/logrotate.d/chef" d
    mode "644"
  end
  
 -directory "/etc/chef/trusted_certs" do
 -  owner "root"
 -  group "root"
 -  mode "755"
 -end
 -
 -template "/etc/chef/trusted_certs/verisign.pem" do
 -  source "verisign.pem.erb"
 -  owner "root"
 -  group "root"
 -  mode "644"
 +# Remove the ancient verisign certificate workaround
 +file "/etc/chef/trusted_certs/verisign.pem" do
 +  action :delete
  end
  
  directory node[:ohai][:plugin_dir] do