From 724cea79e02bdc6d464fc468ba8d9d9cc2e7b773 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 1 May 2020 09:48:16 +0100 Subject: [PATCH] Switch to running chef on a timer instead of as a daemon --- cookbooks/chef/recipes/default.rb | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb index e6979bb4b..c6565c56a 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -109,18 +109,23 @@ directory "/var/log/chef" do end systemd_service "chef-client" do + description "Chef client" + exec_start "/usr/bin/chef-client" +end + +systemd_timer "chef-client" do description "Chef client" after "network.target" - exec_start "/usr/bin/chef-client -i 1800 -s 20" - restart "on-failure" + on_active_sec 60 + on_unit_inactive_sec 25 * 60 + randomized_delay_sec 10 * 60 end -service "chef-client" do +service "chef-client.timer" do action [:enable, :start] - restart_command "systemctl kill --signal=TERM chef-client.service" - 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.service" do + action :disable + subscribes :stop, "service[chef-client.timer]" end -- 2.43.2