Set load average limit for re-renders to number of CPU threads

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

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 31cf233a02d0ee189fe754a1a880147d0a9613a1..90028e9f9833a272b12873b3bf4031443bf26a12 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -32,6 +32,7 @@ property :group, String
 property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"
 property :revision, String, :default => "live"
 property :run_migrations, [true, false], :default => false
 property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"
 property :revision, String, :default => "live"
 property :run_migrations, [true, false], :default => false

+property :build_assets, [true, false], :default => true

 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
 property :status, String, :default => "online"
 property :database_host, String
 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
 property :status, String, :default => "online"
 property :database_host, String


@@ -72,6 +73,7 @@ property :diary_feed_delay, Integer
 property :storage_configuration, Hash, :default => {}
 property :storage_service, String, :default => "local"
 property :storage_url, String
 property :storage_configuration, Hash, :default => {}
 property :storage_service, String, :default => "local"
 property :storage_url, String

+property :tile_cdn_url, String

 
 action :create do
   package %W[
 
 action :create do
   package %W[


@@ -79,12 +81,12 @@ action :create do
     ruby#{new_resource.ruby}-dev
     imagemagick
     nodejs
     ruby#{new_resource.ruby}-dev
     imagemagick
     nodejs

-    geoip-database

     tzdata
   ]
 
   package %w[
     g++
     tzdata
   ]
 
   package %w[
     g++

+    make

     pkg-config
     libpq-dev
     libsasl2-dev
     pkg-config
     libpq-dev
     libsasl2-dev


@@ -180,7 +182,6 @@ action :create do
 
     line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
 
 
     line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
 

-    line.gsub!(/^( *)#geoip_database:.*$/, "\\1geoip_database: \"/usr/share/GeoIP/GeoIPv6.dat\"")

     line.gsub!(/^( *)#maxmind_database:.*$/, "\\1maxmind_database: \"/usr/share/GeoIP/GeoLite2-Country.mmdb\"")
 
     if new_resource.gpx_dir
     line.gsub!(/^( *)#maxmind_database:.*$/, "\\1maxmind_database: \"/usr/share/GeoIP/GeoLite2-Country.mmdb\"")
 
     if new_resource.gpx_dir


@@ -319,14 +320,14 @@ action :create do
     "trace_use_job_queue",
     "diary_feed_delay",
     "storage_service",
     "trace_use_job_queue",
     "diary_feed_delay",
     "storage_service",

-    "storage_url"
-  ).reject { |_k, v| v.nil? }.merge(
+    "storage_url",
+    "tile_cdn_url"
+  ).compact.merge(

     "server_protocol" => "https",
     "server_url" => new_resource.site,
     "support_email" => "support@openstreetmap.org",
     "email_return_path" => "bounces@openstreetmap.org",
     "geonames_username" => "openstreetmap",
     "server_protocol" => "https",
     "server_url" => new_resource.site,
     "support_email" => "support@openstreetmap.org",
     "email_return_path" => "bounces@openstreetmap.org",
     "geonames_username" => "openstreetmap",

-    "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat",

     "maxmind_database" => "/usr/share/GeoIP/GeoLite2-Country.mmdb"
   )
 
     "maxmind_database" => "/usr/share/GeoIP/GeoLite2-Country.mmdb"
   )
 


@@ -397,20 +398,39 @@ action :create do
     only_if { new_resource.run_migrations }
   end
 
     only_if { new_resource.run_migrations }
   end
 

+  package "yarnpkg" do
+    only_if { new_resource.build_assets }
+  end
+
+  execute "#{rails_directory}/package.json" do
+    action :nothing
+    command "bundle#{new_resource.ruby} exec rake yarn:install"
+    environment "HOME" => rails_directory,
+                "RAILS_ENV" => "production"
+    cwd rails_directory
+    user new_resource.user
+    group new_resource.group
+    subscribes :run, "git[#{rails_directory}]"
+    only_if { new_resource.build_assets }
+  end
+

   execute "#{rails_directory}/app/assets/javascripts/i18n" do
     action :nothing
     command "bundle#{new_resource.ruby} exec rake i18n:js:export"
   execute "#{rails_directory}/app/assets/javascripts/i18n" do
     action :nothing
     command "bundle#{new_resource.ruby} exec rake i18n:js:export"

-    environment "RAILS_ENV" => "production"
+    environment "HOME" => rails_directory,
+                "RAILS_ENV" => "production"

     cwd rails_directory
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"
     cwd rails_directory
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"

+    only_if { new_resource.build_assets }

   end
 
   execute "#{rails_directory}/public/assets" do
     action :nothing
     command "bundle#{new_resource.ruby} exec rake assets:precompile"
   end
 
   execute "#{rails_directory}/public/assets" do
     action :nothing
     command "bundle#{new_resource.ruby} exec rake assets:precompile"

-    environment "RAILS_ENV" => "production"
+    environment "HOME" => rails_directory,
+                "RAILS_ENV" => "production"

     cwd rails_directory
     user new_resource.user
     group new_resource.group
     cwd rails_directory
     user new_resource.user
     group new_resource.group


@@ -419,13 +439,16 @@ action :create do
     subscribes :run, "file[#{rails_directory}/config/settings.local.yml]"
     subscribes :run, "file[#{rails_directory}/config/storage.yml]"
     subscribes :run, "file[#{rails_directory}/config/piwik.yml]"
     subscribes :run, "file[#{rails_directory}/config/settings.local.yml]"
     subscribes :run, "file[#{rails_directory}/config/storage.yml]"
     subscribes :run, "file[#{rails_directory}/config/piwik.yml]"

+    subscribes :run, "execute[#{rails_directory}/package.json]"

     subscribes :run, "execute[#{rails_directory}/app/assets/javascripts/i18n]"
     notifies :restart, "passenger_application[#{rails_directory}]"
     subscribes :run, "execute[#{rails_directory}/app/assets/javascripts/i18n]"
     notifies :restart, "passenger_application[#{rails_directory}]"

+    only_if { new_resource.build_assets }

   end
 
   file "#{rails_directory}/public/export/embed.html" do
     action :nothing
     subscribes :delete, "git[#{rails_directory}]"
   end
 
   file "#{rails_directory}/public/export/embed.html" do
     action :nothing
     subscribes :delete, "git[#{rails_directory}]"

+    subscribes :delete, "file[#{rails_directory}/config/settings.local.yml]"

   end
 
   passenger_application rails_directory do
   end
 
   passenger_application rails_directory do