Merge remote-tracking branch 'github/pull/451'

[chef.git] / cookbooks / chef / recipes / default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index e6979bb4bc39cb53da9362460908af170d5c7a8e..61ac42415fd2a36aeb08c168da46c78fa22e3a79 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -40,7 +40,7 @@ remote_file "#{cache_dir}/#{chef_package}" do
   source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/#{node[:lsb][:release]}/#{chef_package}"
   owner "root"
   group "root"
   source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/#{node[:lsb][:release]}/#{chef_package}"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   backup false
   ignore_failure true
 end
   backup false
   ignore_failure true
 end


@@ -53,74 +53,79 @@ end
 directory "/etc/chef" do
   owner "root"
   group "root"
 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"
 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"
 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"
 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"
 end
 
 template "/etc/logrotate.d/chef" do
   source "logrotate.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory "/etc/chef/trusted_certs" do
   owner "root"
   group "root"
 end
 
 directory "/etc/chef/trusted_certs" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/chef/trusted_certs/verisign.pem" do
   source "verisign.pem.erb"
   owner "root"
   group "root"
 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"
 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"
 end
 
 directory "/var/log/chef" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "chef-client" 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"
   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
 
 end
 

-service "chef-client" do
+service "chef-client.timer" do

   action [:enable, :start]
   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
 end