Use passenger-config to restart rails

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index a9fa67b58fd1884987b710a8f2cf84829409b7e3..a5c1042151cdd203265862412b528419df043945 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -34,11 +34,11 @@ 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
 
@@ -109,7 +109,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