X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/83761ddfb2f6ba694f925098f371a82a19e7ef1b..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/chef/recipes/default.rb diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb index c06384be7..a27b99cbd 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: chef +# Cookbook:: chef # Recipe:: default # -# Copyright 2010, OpenStreetMap Foundation +# Copyright:: 2010, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,17 +17,43 @@ # limitations under the License. # +cache_dir = Chef::Config[:file_cache_path] + chef_version = node[:chef][:client][:version] -chef_package = "chef_#{chef_version}-1_amd64.deb" + +chef_platform = if platform?("debian") + "debian" + else + "ubuntu" + end + +chef_arch = if arm? + "arm64" + else + "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 - owner "root" - group "root" - mode 0o755 + action :delete + recursive true end -Dir.glob("/var/cache/chef/chef_*.deb").each do |deb| - next if deb == "/var/cache/chef/#{chef_package}" +Dir.glob("#{cache_dir}/chef_*.deb").each do |deb| + next if deb == "#{cache_dir}/#{chef_package}" file deb do action :delete @@ -35,110 +61,79 @@ Dir.glob("/var/cache/chef/chef_*.deb").each do |deb| end end -remote_file "/var/cache/chef/#{chef_package}" do - source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/16.04/#{chef_package}" +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" group "root" - mode 0o644 + mode "644" backup false ignore_failure true end dpkg_package "chef" do - source "/var/cache/chef/#{chef_package}" + source "#{cache_dir}/#{chef_package}" version "#{chef_version}-1" end directory "/etc/chef" do owner "root" group "root" - mode 0o755 + mode "755" end template "/etc/chef/client.rb" do source "client.rb.erb" owner "root" group "root" - mode 0o640 + mode "640" end file "/etc/chef/client.pem" do owner "root" group "root" - mode 0o400 + mode "400" end template "/etc/chef/report.rb" do source "report.rb.erb" owner "root" group "root" - mode 0o644 + mode "644" end template "/etc/logrotate.d/chef" do source "logrotate.erb" owner "root" group "root" - mode 0o644 -end - -directory "/etc/chef/trusted_certs" do - owner "root" - group "root" - mode 0o755 -end - -template "/etc/chef/trusted_certs/verisign.pem" do - source "verisign.pem.erb" - owner "root" - group "root" - mode 0o644 + mode "644" end directory node[:ohai][:plugin_dir] do owner "root" group "root" - mode 0o755 + mode "755" end directory "/var/log/chef" do owner "root" group "root" - mode 0o755 + mode "755" end -if node[:lsb][:release].to_f >= 15.10 - systemd_service "chef-client" do - description "Chef client" - after "network.target" - exec_start "/usr/bin/chef-client -i 1800 -s 20" - restart "on-failure" - end +systemd_service "chef-client" do + description "Chef client" + exec_start "/usr/bin/chef-client" + nice 10 +end - service "chef-client" do - provider Chef::Provider::Service::Systemd - action [:enable, :start] - supports :status => true, :restart => true, :reload => true - subscribes :restart, "dpkg_package[chef]" - subscribes :restart, "systemd_service[chef-client]" - subscribes :restart, "template[/etc/chef/client.rb]" - subscribes :restart, "template[/etc/chef/report.rb]" - end -else - template "/etc/init/chef-client.conf" do - source "chef-client.conf.erb" - owner "root" - group "root" - mode 0o644 - end +systemd_timer "chef-client" do + description "Chef client" + after "network.target" + on_active_sec 60 + on_unit_inactive_sec 25 * 60 + randomized_delay_sec 10 * 60 +end - service "chef-client" do - provider Chef::Provider::Service::Upstart - action [:enable, :start] - supports :status => true, :restart => true, :reload => true - subscribes :restart, "dpkg_package[chef]" - subscribes :restart, "template[/etc/init/chef-client.conf]" - subscribes :restart, "template[/etc/chef/client.rb]" - subscribes :restart, "template[/etc/chef/report.rb]" - end +service "chef-client.timer" do + action [:enable, :start] end