浏览代码

[COOK-542] additional fixes for deploy resource being searched by outdated name

Seth Chisamore 13 年之前
父节点
当前提交
90e60ecbab
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 1 1
      recipes/mod_php_apache2.rb
  2. 5 3
      recipes/passenger_apache2.rb

+ 1 - 1
recipes/mod_php_apache2.rb

@@ -42,7 +42,7 @@ web_app app['id'] do
 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

+ 5 - 3
recipes/passenger_apache2.rb

@@ -40,9 +40,11 @@ web_app app['id'] do
   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