Only add a domein to relay_to_domains if we are really relaying to it

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index bbd9750f5e40fa67333226b5dc04f9a620a06e12..902eab14aeff8632077581c1c2b4f29fb8452bd1 100644 (file)
--- 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,7 +33,7 @@ directory "/var/cache/chef" do
   mode 0755
 end
 
-Dir.glob("/var/cache/chef/chef_*.ubuntu.11.04_amd64.deb").each do |deb|
+Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
   if deb != "/var/cache/chef/#{chef_package}"
     file deb do
       action :delete
@@ -37,12 +43,12 @@ Dir.glob("/var/cache/chef/chef_*.ubuntu.11.04_amd64.deb").each do |deb|
 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"