X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/74c2316a8d5cb85c0e7d5a31e661ce8fcd812512..1cb6635911ae9d6feab1c8efc7d4c33380169cd5:/cookbooks/chef/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index b440d85e9..096c6dfde 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -21,12 +21,6 @@ chef_gem "pony"
 
 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"
   group "root"
@@ -34,16 +28,16 @@ directory "/var/cache/chef" do
 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
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
+  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/10.04/x86_64/#{chef_package}"
   owner "root"
   group "root"
   mode 0644
@@ -109,7 +103,7 @@ template "/etc/chef/trusted_certs/verisign.pem" do
   mode 0644
 end
 
-directory "/etc/chef/ohai" do
+directory node[:ohai][:plugin_dir] do
   owner "root"
   group "root"
   mode 0755
@@ -123,7 +117,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]"