X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/890e193607b788e7ce10b7e0508e52eb685b5cfb..45cacb1e2f232b55f200301f49ff9e9c70118028:/cookbooks/chef/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index b0d30cc9d..e6979bb4b 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: chef
+# Cookbook:: chef
 # Recipe:: default
 #
-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,94 +17,107 @@
 # limitations under the License.
 #
 
-chef_gem "pony"
+cache_dir = Chef::Config[:file_cache_path]
 
-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
+  action :delete
+  recursive true
 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
+Dir.glob("#{cache_dir}/chef_*.deb").each do |deb|
+  next if deb == "#{cache_dir}/#{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}"
+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"
-  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
+  source "#{cache_dir}/#{chef_package}"
+  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/ohai" do
+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 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
+
+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::Upstart
-  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]"