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 cf3b6b083ccd16b37afdf3268b3b7a4e9b1ef6c0..8da12cc53790319cfe2b8bb05cb9e83f832b31c9 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -28,7 +28,7 @@ property :ruby, String, :default => "2.3"
 property :directory, String
 property :user, String
 property :group, String
-property :repository, String, :default => "git://git.openstreetmap.org/rails.git"
+property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"
 property :revision, String, :default => "live"
 property :run_migrations, [TrueClass, FalseClass], :default => false
 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
@@ -102,18 +102,14 @@ action :create do
 
   gem_package "bundler#{new_resource.ruby}" do
     package_name "bundler"
-    version "1.3.5"
+    version "1.16.2"
     gem_binary "gem#{new_resource.ruby}"
     options "--format-executable"
   end
 
-  file "/usr/lib/ruby/1.8/rack.rb" do
-    action :delete
-  end
-
-  declare_resource :directory, "/usr/lib/ruby/1.8/rack" do
-    action :delete
-    recursive true
+  gem_package "bundler#{new_resource.ruby}" do
+    package_name "pkg-config"
+    gem_binary "gem#{new_resource.ruby}"
   end
 
   declare_resource :directory, rails_directory do
@@ -340,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") }
@@ -359,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