X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/769a780df44dd75b0a5bafc5119a08da23752e23..83761ddfb2f6ba694f925098f371a82a19e7ef1b:/cookbooks/chef/recipes/default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 096c6dfde..c06384be7 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -17,14 +17,13 @@
 # limitations under the License.
 #
 
-chef_gem "pony"
-
-chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
+chef_version = node[:chef][:client][:version]
+chef_package = "chef_#{chef_version}-1_amd64.deb"
 
 directory "/var/cache/chef" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
@@ -37,90 +36,109 @@ Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/10.04/x86_64/#{chef_package}"
+  source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/16.04/#{chef_package}"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   backup false
   ignore_failure true
 end
 
 dpkg_package "chef" do
   source "/var/cache/chef/#{chef_package}"
-  version node[:chef][:client][:version]
-end
-
-template "/etc/init/chef-client.conf" do
-  source "chef-client.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
+  version "#{chef_version}-1"
 end
 
 directory "/etc/chef" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/chef/client.rb" do
   source "client.rb.erb"
   owner "root"
   group "root"
-  mode 0640
+  mode 0o640
 end
 
 file "/etc/chef/client.pem" do
   owner "root"
   group "root"
-  mode 0400
+  mode 0o400
 end
 
 template "/etc/chef/report.rb" do
   source "report.rb.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/logrotate.d/chef" do
   source "logrotate.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/etc/chef/trusted_certs" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/chef/trusted_certs/verisign.pem" do
   source "verisign.pem.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory node[:ohai][:plugin_dir] do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/log/chef" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 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]"
+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
+
+  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
+
+  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
 end