X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..cec717b818ba058b4e968fe83b4b4b8e20d87b83:/cookbooks/chef/recipes/default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index bbd9750f5..a5c104215 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -19,7 +19,13 @@
 
 chef_gem "pony"
 
-chef_package = "chef_#{node[:chef][:client][:version]}.ubuntu.11.04_amd64.deb"
+chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
+
+chef_platform = case node[:platform_version]
+                when "12.10" then "12.04"
+                when "14.04" then "13.04"
+                else node[:platform_version]
+                end
 
 directory "/var/cache/chef" do
   owner "root"
@@ -27,22 +33,22 @@ directory "/var/cache/chef" do
   mode 0755
 end
 
-Dir.glob("/var/cache/chef/chef_*.ubuntu.11.04_amd64.deb").each do |deb|
-  if deb != "/var/cache/chef/#{chef_package}"
-    file deb do
-      action :delete
-      backup false
-    end
+Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
+  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/11.04/x86_64/#{chef_package}"
+  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
   owner "root"
   group "root"
   mode 0644
   backup false
+  ignore_failure true
 end
 
 dpkg_package "chef" do
@@ -57,6 +63,12 @@ template "/etc/init/chef-client.conf" do
   mode 0644
 end
 
+directory "/etc/chef" do
+  owner "root"
+  group "root"
+  mode 0755
+end
+
 template "/etc/chef/client.rb" do
   source "client.rb.erb"
   owner "root"
@@ -84,7 +96,20 @@ template "/etc/logrotate.d/chef" do
   mode 0644
 end
 
-directory "/etc/chef/ohai" do
+directory "/etc/chef/trusted_certs" do
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/chef/trusted_certs/verisign.pem" do
+  source "verisign.pem.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+directory node[:ohai][:plugin_dir] do
   owner "root"
   group "root"
   mode 0755
@@ -98,7 +123,7 @@ end
 
 service "chef-client" do
   provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "dpkg_package[chef]"
   subscribes :restart, "template[/etc/init/chef-client.conf]"