Remove bogus row limit from chef server status view

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 5ca080cb4d417666f4da2682f36dd134d0f38939..7a58054900ace1d724d8d7c3fa37985d1be4d5f5 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -19,7 +19,12 @@
 
 chef_gem "pony"
 
 
 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"
+                  else node[:platform_version]
+                end

 
 directory "/var/cache/chef" do
   owner "root"
 
 directory "/var/cache/chef" do
   owner "root"


@@ -27,7 +32,7 @@ directory "/var/cache/chef" do
   mode 0755
 end
 
   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
   if deb != "/var/cache/chef/#{chef_package}"
     file deb do
       action :delete


@@ -38,7 +43,7 @@ end
 
 remote_file "/var/cache/chef/#{chef_package}" do
   action :create_if_missing
 
 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
   owner "root"
   group "root"
   mode 0644