X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/890e193607b788e7ce10b7e0508e52eb685b5cfb..93462ef55b24b71edbcdbe0f1694f5ae483c6c6c:/cookbooks/chef/recipes/default.rb?ds=inline

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index b0d30cc9d..c6b5b0102 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -17,32 +17,30 @@
 # limitations under the License.
 #
 
-chef_gem "pony"
-
 chef_package = "chef_#{node[:chef][:client][:version]}_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|
-  if deb != "/var/cache/chef/#{chef_package}"
-    file deb do
-      action :delete
-      backup false
-    end
+  next if deb == "/var/cache/chef/#{chef_package}"
+
+  file deb do
+    action :delete
+    backup false
   end
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
-  action :create_if_missing
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{node[:platform_version]}/x86_64/#{chef_package}"
+  source "https://packages.chef.io/stable/ubuntu/12.04/#{chef_package}"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   backup false
+  ignore_failure true
 end
 
 dpkg_package "chef" do
@@ -50,64 +48,96 @@ dpkg_package "chef" do
   version node[:chef][:client][:version]
 end
 
-template "/etc/init/chef-client.conf" do
-  source "chef-client.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-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 0o755
 end
 
-directory "/etc/chef/ohai" do
+template "/etc/chef/trusted_certs/verisign.pem" do
+  source "verisign.pem.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o644
+end
+
+directory node[:ohai][:plugin_dir] do
+  owner "root"
+  group "root"
+  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