X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8704355db8617d920102bfcb89f59b88a238bc76..52828e58aaa9b6de4231e34f769003a979e36817:/cookbooks/dev/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 5a2e7f86d..63d82b37d 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -203,6 +203,22 @@ if node[:postgresql][:clusters][:"9.5/main"]
     mode 0o755
   end
 
+  ruby_version = node[:passenger][:ruby_version]
+
+  systemd_service "rails-jobs@" do
+    description "Rails job queue runner"
+    type "simple"
+    user "apis"
+    working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
+    exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"
+    restart "on-failure"
+    private_tmp true
+    private_devices true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true
+  end
+
   systemd_service "cgimap@" do
     description "OpenStreetMap API Server"
     type "forking"
@@ -227,6 +243,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
     log_directory = "#{site_directory}/logs"
     rails_directory = "#{site_directory}/rails"
     cgimap_directory = "#{site_directory}/cgimap"
+    gpx_directory = "#{site_directory}/gpx"
 
     if details[:repository]
       site_aliases = details[:aliases] || []
@@ -257,8 +274,26 @@ if node[:postgresql][:clusters][:"9.5/main"]
         mode 0o755
       end
 
+      directory gpx_directory do
+        owner "apis"
+        group "apis"
+        mode 0o755
+      end
+
+      directory "#{gpx_directory}/traces" do
+        owner "apis"
+        group "apis"
+        mode 0o755
+      end
+
+      directory "#{gpx_directory}/images" do
+        owner "apis"
+        group "apis"
+        mode 0o755
+      end
+
       rails_port site_name do
-        ruby node[:passenger][:ruby_version]
+        ruby ruby_version
         directory rails_directory
         user "apis"
         group "apis"
@@ -267,10 +302,12 @@ if node[:postgresql][:clusters][:"9.5/main"]
         database_port node[:postgresql][:clusters][:"9.5/main"][:port]
         database_name database_name
         database_username "apis"
+        gpx_dir gpx_directory
         log_path "#{log_directory}/rails.log"
         memcache_servers ["127.0.0.1"]
         csp_enforce true
         run_migrations true
+        trace_use_job_queue true
       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do
@@ -282,6 +319,14 @@ if node[:postgresql][:clusters][:"9.5/main"]
         notifies :restart, "rails_port[#{site_name}]"
       end
 
+      service "rails-jobs@#{name}" do
+        action [:enable, :start]
+        supports :restart => true
+        subscribes :restart, "rails_port[#{site_name}]"
+        subscribes :restart, "systemd_service[#{name}]"
+        only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
+      end
+
       if details[:cgimap_repository]
         git cgimap_directory do
           action :sync
@@ -302,7 +347,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
         execute "#{cgimap_directory}/configure" do
           action :nothing
-          command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
+          command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu --enable-yajl"
           cwd cgimap_directory
           user "apis"
           group "apis"