X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/197938971d3d7db631c4d59f5325f597d4fb834f..a7d7bb9186bcd1ce33483c4587b80c90bc03534b:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 3c02066db..3a708a018 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -35,11 +35,13 @@ include_recipe "ruby"
 
 package %w[
   ant
+  apache2-dev
   aria2
   at
   autoconf
   automake
   awscli
+  cmake
   composer
   default-jdk-headless
   default-jre-headless
@@ -65,13 +67,20 @@ package %w[
   libboost-program-options-dev
   libboost-regex-dev
   libboost-system-dev
+  libbytes-random-secure-perl
+  libcairo2-dev
   libcrypto++-dev
+  libcurl4-openssl-dev
   libfcgi-dev
   libfmt-dev
+  libglib2.0-dev
+  libiniparser-dev
   libjson-xs-perl
+  libmapnik-dev
   libmemcached-dev
   libpqxx-dev
   libtool
+  libxml-twig-perl
   libxml2-dev
   libyajl-dev
   lua-any
@@ -289,7 +298,7 @@ if node[:postgresql][:clusters][:"15/main"]
   systemd_service "rails-jobs@" do
     description "Rails job queue runner"
     type "simple"
-    environment "RAILS_ENV" => "production", "SLEEP_DELAY" => "60"
+    environment_file "/etc/default/rails-%i"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"
@@ -300,7 +309,7 @@ if node[:postgresql][:clusters][:"15/main"]
     memory_deny_write_execute false
     read_write_paths [
       "/srv/%i.apis.dev.openstreetmap.org/logs",
-      "/srv/%i.apis.dev.openstreetmap.org/storage"
+      "/srv/%i.apis.dev.openstreetmap.org/rails/storage"
     ]
   end
 
@@ -404,6 +413,14 @@ if node[:postgresql][:clusters][:"15/main"]
         notifies :restart, "rails_port[#{site_name}]"
       end
 
+      template "/etc/default/rails-#{name}" do
+        source "rails.environment.erb"
+        owner "root"
+        group "root"
+        mode "0600"
+        variables :secret_key_base => secret_key_base
+      end
+
       service "rails-jobs@#{name}" do
         action [:enable, :start]
         supports :restart => true
@@ -456,7 +473,8 @@ if node[:postgresql][:clusters][:"15/main"]
           variables :cgimap_port => cgimap_port,
                     :database_port => node[:postgresql][:clusters][:"15/main"][:port],
                     :database_name => database_name,
-                    :log_directory => log_directory
+                    :log_directory => log_directory,
+                    :options => details[:cgimap_options]
         end
 
         service "cgimap@#{name}" do
@@ -586,3 +604,16 @@ end
 apache_site "ooc.openstreetmap.org" do
   template "apache.ooc.erb"
 end
+
+directory "/etc/systemd/system/user-.slice.d" do
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
+template "/etc/systemd/system/user-.slice.d/99-chef.conf" do
+  source "user-slice.conf.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+end