imagery: move service from layer to site

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 2d9dc4fe0f2c1f1561848416b2643e4d512dccf1..73228580e375524f6d949ad1ba82de29e8e87db8 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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,16 +17,13 @@
 # limitations under the License.
 #
 
-chef_gem "pony" do
-  compile_time false
-end
-
-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|
@@ -39,75 +36,75 @@ 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]
+  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
 
 if node[:lsb][:release].to_f >= 15.10
@@ -117,31 +114,23 @@ if node[:lsb][:release].to_f >= 15.10
     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 0644
+    mode 0o644
   end
+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]"
+service "chef-client" do
+  action [:enable, :start]
+  if node[:lsb][:release].to_f >= 15.10
+    restart_command "systemctl kill --signal=TERM chef-client.service"
   end
+  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