X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a2b86e1616a830f61beea7cb21fef79974c52875..e2d9c76e0d9a32f82f45b7a3d98199eb18405351:/cookbooks/chef/recipes/default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 2ab55ac60..2d9dc4fe0 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -111,17 +111,11 @@ directory "/var/log/chef" do
 end
 
 if node[:lsb][:release].to_f >= 15.10
-  execute "systemctl-daemon-reload" do
-    action :nothing
-    command "systemctl daemon-reload"
-  end
-
-  template "/etc/systemd/system/chef-client.service" do
-    source "chef-client.service.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    notifies :run, "execute[systemctl-daemon-reload]"
+  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
 
   service "chef-client" do
@@ -129,7 +123,7 @@ if node[:lsb][:release].to_f >= 15.10
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => true
     subscribes :restart, "dpkg_package[chef]"
-    subscribes :restart, "template[/etc/systemd/system/chef-client.service]"
+    subscribes :restart, "systemd_service[chef-client]"
     subscribes :restart, "template[/etc/chef/client.rb]"
     subscribes :restart, "template[/etc/chef/report.rb]"
   end