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 dbc5c32107a6dbcf4b3be501b2e960cd18c5a508..616f4dd18d0630ebfe39b164ff507ad1200accf5 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -19,7 +19,7 @@
 
 require "yaml"
 
-define :rails_port, :action => [ :create, :enable ] do
+define :rails_port, :action => [:create, :enable] do
   name = params[:name]
   ruby_version = params[:ruby] || "1.9.1"
   rails_directory = params[:directory] || "/srv/#{name}"
@@ -40,12 +40,13 @@ 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"
 
   package "g++"
+  package "pkg-config"
   package "libpq-dev"
   package "libsasl2-dev"
   package "libxml2-dev"
@@ -68,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
@@ -78,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
@@ -102,6 +107,7 @@ define :rails_port, :action => [ :create, :enable ] do
     cwd rails_directory
     user "root"
     group "root"
+    environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     if run_migrations
       notifies :run, "execute[#{rails_directory}/db/migrate]"
     else
@@ -142,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|
@@ -165,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\"")
@@ -202,6 +200,10 @@ define :rails_port, :action => [ :create, :enable ] do
       line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{params[:oauth_key]}\"")
     end
 
+    if params[:nominatim_url]
+      line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"")
+    end
+
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
@@ -213,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]
@@ -236,7 +238,7 @@ define :rails_port, :action => [ :create, :enable ] do
     cwd "#{rails_directory}/lib/quad_tile"
     user rails_user
     group rails_group
-    not_if { File.exist?("#{rails_directory}/lib/quad_tile/Makefile") and File.mtime("#{rails_directory}/lib/quad_tile/Makefile") >= File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") }
+    not_if { File.exist?("#{rails_directory}/lib/quad_tile/Makefile") && File.mtime("#{rails_directory}/lib/quad_tile/Makefile") >= File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") }
   end
 
   execute "#{rails_directory}/lib/quad_tile/Makefile" do
@@ -245,12 +247,12 @@ define :rails_port, :action => [ :create, :enable ] do
     user rails_user
     group rails_group
     not_if do
-      File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") and
-      File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/Makefile") and
-      File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") and
-      File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h")
+      File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") &&
+        File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/Makefile") &&
+        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