Update formatting of header comments

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 999cc4ba3813b5dbf42738e2c94c8cc506e8a99e..a5729160faceb52b972d06d8ffc27dddcadb6861 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: dev
+# Cookbook:: dev
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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"
@@ -224,8 +240,10 @@ if node[:postgresql][:clusters][:"9.5/main"]
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"
     site_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
+    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] || []
@@ -250,8 +268,32 @@ if node[:postgresql][:clusters][:"9.5/main"]
         mode 0o755
       end
 
+      directory log_directory do
+        owner "apis"
+        group "apis"
+        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"
@@ -260,9 +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
@@ -274,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
@@ -294,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"
@@ -319,7 +372,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
           variables :cgimap_port => cgimap_port,
                     :database_port => node[:postgresql][:clusters][:"9.5/main"][:port],
                     :database_name => database_name,
-                    :rails_directory => rails_directory
+                    :log_directory => log_directory
           notifies :restart, "service[cgimap@#{name}]"
         end
 
@@ -342,8 +395,22 @@ if node[:postgresql][:clusters][:"9.5/main"]
                   :cgimap_port => cgimap_port
       end
 
+      template "/etc/logrotate.d/apis-#{name}" do
+        source "logrotate.apis.erb"
+        owner "root"
+        group "root"
+        mode 0o644
+        variables :name => name,
+                  :log_directory => log_directory,
+                  :rails_directory => rails_directory
+      end
+
       cgimap_port += 1
     else
+      file "/etc/logrotate.d/apis-#{name}" do
+        action :delete
+      end
+
       apache_site site_name do
         action [:delete]
       end