[COOK-542] additional fixes for deploy resource being searched by out…

…dated name
chef-boneyard · May 4, 2011 · 5a3a6a8 · 5a3a6a8
1 parent 29d545c
commit 5a3a6a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/application/recipes/mod_php_apache2.rb b/application/recipes/mod_php_apache2.rb
@@ -42,7 +42,7 @@
 end
 
 if ::File.exists?(::File.join(app['deploy_to'], "current"))
-  d = resources(:deploy => app['id'])
+  d = resources(:deploy_revision => app['id'])
   d.restart_command do
     service "apache2" do action :restart; end
   end

diff --git a/application/recipes/passenger_apache2.rb b/application/recipes/passenger_apache2.rb
@@ -40,9 +40,11 @@
   rails_env node.app_environment
 end
 
-d = resources(:deploy_revision => app['id'])
-d.restart_command do
-  service "apache2" do action :restart; end
+if ::File.exists?(::File.join(app['deploy_to'], "current"))
+  d = resources(:deploy_revision => app['id'])
+  d.restart_command do
+    service "apache2" do action :restart; end
+  end
 end
 
 apache_site "000-default" do