Switch remaining render servers to osm2pgsql replication

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index fd5db8de08fb1258417b399874833fc350de2909..3a708a018c413c15910e54bb67881c553de82825 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -67,6 +67,7 @@ package %w[
   libboost-program-options-dev
   libboost-regex-dev
   libboost-system-dev
+  libbytes-random-secure-perl
   libcairo2-dev
   libcrypto++-dev
   libcurl4-openssl-dev
@@ -79,6 +80,7 @@ package %w[
   libmemcached-dev
   libpqxx-dev
   libtool
+  libxml-twig-perl
   libxml2-dev
   libyajl-dev
   lua-any
@@ -296,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"
@@ -411,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
@@ -463,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
@@ -593,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