X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..78e734dea909c93e0ad116d49254cdf43182a636:/cookbooks/web/definitions/rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index a072a88b6..616f4dd18 100644
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -40,8 +40,8 @@ define :rails_port, :action => [:create, :enable] do
 
   package "ruby#{ruby_version}"
   package "ruby#{ruby_version}-dev"
-  package "rubygems#{ruby_version}"
-  package "irb#{ruby_version}"
+  package "rubygems#{ruby_version}" if ruby_version.to_f < 1.9
+  package "irb#{ruby_version}" if ruby_version.to_f < 1.9
   package "imagemagick"
   package "nodejs"
 
@@ -69,8 +69,12 @@ 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"
+    only_if { File.exist?("/usr/bin/passenger-config") }
   end
 
   file "#{rails_directory}/public/export/embed.html" do
@@ -79,18 +83,18 @@ define :rails_port, :action => [:create, :enable] do
 
   execute "#{rails_directory}/public/assets" do
     action :nothing
-    command "rake#{ruby_version} assets:precompile"
+    command "bundle#{ruby_version} exec rake#{ruby_version} assets:precompile"
     environment "RAILS_ENV" => "production"
     cwd rails_directory
     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
     action :nothing
-    command "rake#{ruby_version} db:migrate"
+    command "bundle#{ruby_version} exec rake#{ruby_version} db:migrate"
     cwd rails_directory
     user rails_user
     group rails_group
@@ -144,7 +148,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|
@@ -167,14 +171,6 @@ define :rails_port, :action => [:create, :enable] do
       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\"")
@@ -219,7 +215,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 +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
-    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   template "/etc/cron.daily/rails-#{name}" do