Switch to running chef on a timer instead of as a daemon

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index e6979bb4bc39cb53da9362460908af170d5c7a8e..c6565c56abafb6807b0511703418ca197f7a39ad 100644 (file)
--- 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