Use passenger-config to restart rails

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 62eac34c4e07cca9590b93f505fee5e0f2951602..607d723b2e290ebff1efa2d7ee5285ffeb4b6846 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -175,7 +175,7 @@ if node[:postgresql][:clusters][:"9.1/main"]
         group "apis"
         mode 0644
         variables :site => site_name
-        notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+        notifies :run, "execute[#{rails_directory}]"
       end
 
       apache_site site_name do

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index a7a8c933ed5f0394caf7378f6f3761e64cc20f47..8076b9bec1407ba38b4deb6298e86fa926ead578 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -69,8 +69,11 @@ define :rails_port, :action => [:create, :enable] do
     recursive true
   end
 
-  file "#{rails_directory}/tmp/restart.txt" do
+  execute rails_directory do
     action :nothing
+    command "passenger-config restart-app #{rails_directory}"
+    user "root"
+    group "root"
   end
 
   file "#{rails_directory}/public/export/embed.html" do
@@ -85,7 +88,7 @@ define :rails_port, :action => [:create, :enable] do
     user rails_user
     group rails_group
     notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   execute "#{rails_directory}/db/migrate" do
@@ -144,7 +147,7 @@ define :rails_port, :action => [:create, :enable] do
     group rails_group
     mode 0664
     variables database_params
-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
@@ -219,7 +222,7 @@ define :rails_port, :action => [:create, :enable] do
     group rails_group
     mode 0664
     content application_yml
-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   if params[:piwik_configuration]
@@ -256,7 +259,7 @@ define :rails_port, :action => [:create, :enable] do
         File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") &&
         File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h")
     end
-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   template "/etc/cron.daily/rails-#{name}" do