More fixes to aggregate graphs

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

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index a7a8c933ed5f0394caf7378f6f3761e64cc20f47..616f4dd18d0630ebfe39b164ff507ad1200accf5 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -69,8 +69,12 @@ define :rails_port, :action => [:create, :enable] do
     recursive true
   end
 
     recursive true
   end
 

-  file "#{rails_directory}/tmp/restart.txt" do
+  execute rails_directory do

     action :nothing
     action :nothing

+    command "passenger-config restart-app #{rails_directory}"
+    user "root"
+    group "root"
+    only_if { File.exist?("/usr/bin/passenger-config") }

   end
 
   file "#{rails_directory}/public/export/embed.html" do
   end
 
   file "#{rails_directory}/public/export/embed.html" do


@@ -85,7 +89,7 @@ define :rails_port, :action => [:create, :enable] do
     user rails_user
     group rails_group
     notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
     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
   end
 
   execute "#{rails_directory}/db/migrate" do


@@ -144,7 +148,7 @@ define :rails_port, :action => [:create, :enable] do
     group rails_group
     mode 0664
     variables database_params
     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|
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|


@@ -167,14 +171,6 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
     end
 
       line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
     end
 

-    if params[:soft_memory_limit]
-      line.gsub!(/^( *)#soft_memory_limit:.*$/, "\\1soft_memory_limit: #{params[:soft_memory_limit]}")
-    end
-
-    if params[:hard_memory_limit]
-      line.gsub!(/^( *)#hard_memory_limit:.*$/, "\\1hard_memory_limit: #{params[:hard_memory_limit]}")
-    end
-

     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
       line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")
     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
       line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")


@@ -219,7 +215,7 @@ define :rails_port, :action => [:create, :enable] do
     group rails_group
     mode 0664
     content application_yml
     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]
   end
 
   if params[:piwik_configuration]


@@ -256,7 +252,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
         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
   end
 
   template "/etc/cron.daily/rails-#{name}" do