X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e2cbf44f9da7d166987294c476df694215880712..e4cd927b82f71acc58af48b9eb5757711c5e683b:/cookbooks/web/definitions/rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index a6bf96963..cbc967e4d 100644
--- 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,11 +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"
@@ -67,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
@@ -77,22 +82,22 @@ 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, resources(:file => "#{rails_directory}/public/export/embed.html")
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
+    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
-    notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+    notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 
   execute "#{rails_directory}/Gemfile" do
@@ -101,12 +106,13 @@ 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, resources(:execute => "#{rails_directory}/db/migrate")
+      notifies :run, "execute[#{rails_directory}/db/migrate]"
     else
-      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+      notifies :run, "execute[#{rails_directory}/public/assets]"
     end
-    subscribes :run, resources(:gem_package => "bundler#{ruby_version}")
+    subscribes :run, "gem_package[bundler#{ruby_version}]"
   end
 
   directory rails_directory do
@@ -121,7 +127,7 @@ define :rails_port, :action => [ :create, :enable ] do
     revision rails_revision
     user rails_user
     group rails_group
-    notifies :run, resources(:execute => "#{rails_directory}/Gemfile")
+    notifies :run, "execute[#{rails_directory}/Gemfile]"
   end
 
   directory "#{rails_directory}/tmp" do
@@ -141,76 +147,74 @@ define :rails_port, :action => [ :create, :enable ] do
     group rails_group
     mode 0664
     variables database_params
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :run, "execute[#{rails_directory}]"
   end
 
-  file "#{rails_directory}/config/application.yml" do
-    owner rails_user
-    group rails_group
-    mode 0664
-    content_from_file "#{rails_directory}/config/example.application.yml" do |line|
-      line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{name}\"")
+  application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
+    line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{name}\"")
 
-      if params[:email_from]
-        line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{params[:email_from]}\"")
-      end
+    if params[:email_from]
+      line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{params[:email_from]}\"")
+    end
 
-      line.gsub!(/^( *)status:.*$/, "\\1status: :#{status}")
+    line.gsub!(/^( *)status:.*$/, "\\1status: :#{status}")
 
-      if params[:messages_domain]
-        line.gsub!(/^( *)#messages_domain:.*$/, "\\1messages_domain: \"#{params[:messages_domain]}\"")
-      end
+    if params[:messages_domain]
+      line.gsub!(/^( *)#messages_domain:.*$/, "\\1messages_domain: \"#{params[:messages_domain]}\"")
+    end
 
-      line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
+    line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
 
-      if params[:quova_username]
-        line.gsub!(/^( *)#quova_username:.*$/, "\\1quova_username: \"#{params[:quova_username]}\"")
-        line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
-      end
+    if params[:quova_username]
+      line.gsub!(/^( *)#quova_username:.*$/, "\\1quova_username: \"#{params[:quova_username]}\"")
+      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[: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\"")
+    end
 
-      if params[:hard_memory_limit]
-        line.gsub!(/^( *)#hard_memory_limit:.*$/, "\\1hard_memory_limit: #{params[:hard_memory_limit]}")
-      end
+    if params[:attachments_dir]
+      line.gsub!(/^( *)attachments_dir:.*$/, "\\1attachments_dir: \"#{params[:attachments_dir]}\"")
+    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\"")
-      end
+    if params[:log_path]
+      line.gsub!(/^( *)#log_path:.*$/, "\\1log_path: \"#{params[:log_path]}\"")
+    end
 
-      if params[:attachments_dir]
-        line.gsub!(/^( *)attachments_dir:.*$/, "\\1attachments_dir: \"#{params[:attachments_dir]}\"")
-      end
+    if params[:memcache_servers]
+      line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join("\", \"")}\" ]")
+    end
 
-      if params[:log_path]
-        line.gsub!(/^( *)#log_path:.*$/, "\\1log_path: \"#{params[:log_path]}\"")
-      end
+    if params[:potlatch2_key]
+      line.gsub!(/^( *)#potlatch2_key:.*$/, "\\1potlatch2_key: \"#{params[:potlatch2_key]}\"")
+    end
 
-      if params[:memcache_servers]
-        line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join("\", \"")}\" ]")
-      end
+    if params[:id_key]
+      line.gsub!(/^( *)#id_key:.*$/, "\\1id_key: \"#{params[:id_key]}\"")
+    end
 
-      if params[:potlatch2_key]
-        line.gsub!(/^( *)#potlatch2_key:.*$/, "\\1potlatch2_key: \"#{params[:potlatch2_key]}\"")
-      end
+    if params[:oauth_key]
+      line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{params[:oauth_key]}\"")
+    end
 
-      if params[:id_key]
-        line.gsub!(/^( *)#id_key:.*$/, "\\1id_key: \"#{params[:id_key]}\"")
-      end
+    if params[:nominatim_url]
+      line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"")
+    end
 
-      if params[:oauth_key]
-        line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{params[:oauth_key]}\"")
-      end
+    line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
+    line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
-      line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
-      line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
+    line
+  end
 
-      line
-    end
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+  file "#{rails_directory}/config/application.yml" do
+    owner rails_user
+    group rails_group
+    mode 0664
+    content application_yml
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   if params[:piwik_configuration]
@@ -219,12 +223,12 @@ define :rails_port, :action => [ :create, :enable ] do
       group rails_group
       mode 0664
       content YAML.dump(params[:piwik_configuration])
-      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+      notifies :run, "execute[#{rails_directory}/public/assets]"
     end
   else
     file "#{rails_directory}/config/piwik.yml" do
       action :delete
-      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+      notifies :run, "execute[#{rails_directory}/public/assets]"
     end
   end
 
@@ -233,7 +237,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
@@ -242,12 +246,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, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :run, "execute[#{rails_directory}]"
   end
 
   template "/etc/cron.daily/rails-#{name}" do