Use an explicit array

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 5cc28fa69f09c2b6a8b8fc1d7dc33c55d728bd4d..37c84e78f299c19973031e65614e1f6a4abb282f 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -20,9 +20,9 @@
 include_recipe "apache::ssl"
 
 chef_platform = case node[:platform_version]
 include_recipe "apache::ssl"
 
 chef_platform = case node[:platform_version]

-                  when "12.10" then "12.04"
-                  when "14.04" then "12.04"
-                  else node[:platform_version]
+                when "12.10" then "12.04"
+                when "14.04" then "12.04"
+                else node[:platform_version]

                 end
 
 chef_package = "chef-server_#{node[:chef][:server][:version]}_amd64.deb"
                 end
 
 chef_package = "chef-server_#{node[:chef][:server][:version]}_amd64.deb"


@@ -34,11 +34,11 @@ directory "/var/cache/chef" do
 end
 
 Dir.glob("/var/cache/chef/chef-server_*.deb").each do |deb|
 end
 
 Dir.glob("/var/cache/chef/chef-server_*.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
 
   end
 end
 


@@ -85,7 +85,7 @@ end
 
 service "chef-server-runsvdir" do
   provider Chef::Provider::Service::Upstart
 
 service "chef-server-runsvdir" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end