X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1ba153e476544789cf7d4596a102427371c22816..98c8d0026a2836abf350ac2a393930ff81cef41c:/cookbooks/chef/recipes/default.rb diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb index bd22671a7..5a711398f 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -20,7 +20,12 @@ cache_dir = Chef::Config[:file_cache_path] chef_version = node[:chef][:client][:version] -chef_package = "chef_#{chef_version}-1_amd64.deb" +chef_arch = if arm? + "arm64" + else + "amd64" + end +chef_package = "chef_#{chef_version}-1_#{chef_arch}.deb" directory "/var/cache/chef" do action :delete @@ -36,11 +41,7 @@ Dir.glob("#{cache_dir}/chef_*.deb").each do |deb| end end -ubuntu_release = if node[:lsb][:release].to_f < 22.04 - node[:lsb][:release] - else - "20.04" - end +ubuntu_release = node[:lsb][:release] remote_file "#{cache_dir}/#{chef_package}" do source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/#{ubuntu_release}/#{chef_package}" @@ -117,6 +118,7 @@ end systemd_service "chef-client" do description "Chef client" exec_start "/usr/bin/chef-client" + nice 10 end systemd_timer "chef-client" do