Don't error if passenger isn't running when we restart the web site

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 44c42470c20d7443b3ef90654e707b3d4aad7cc7..8da12cc53790319cfe2b8bb05cb9e83f832b31c9 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -107,6 +107,11 @@ action :create do
     options "--format-executable"
   end
 
+  gem_package "bundler#{new_resource.ruby}" do
+    package_name "pkg-config"
+    gem_binary "gem#{new_resource.ruby}"
+  end
+
   declare_resource :directory, rails_directory do
     owner new_resource.user
     group new_resource.group
@@ -331,7 +336,7 @@ action :create do
 
   execute rails_directory do
     action :nothing
-    command "passenger-config restart-app --ignore-app-not-running #{rails_directory}"
+    command "passenger-config restart-app --ignore-app-not-running --ignore-passenger-not-running #{rails_directory}"
     user "root"
     group "root"
     only_if { ::File.exist?("/usr/bin/passenger-config") }
@@ -350,7 +355,7 @@ end
 action :restart do
   execute rails_directory do
     action :run
-    command "passenger-config restart-app --ignore-app-not-running #{rails_directory}"
+    command "passenger-config restart-app --ignore-app-not-running --ignore-passenger-not-running #{rails_directory}"
     user "root"
     group "root"
   end