Ignore failures fetching the nodesource repo key

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d8309f336d2011b6d3d084175bfaa984ce9e622c..9817e5b347ee3dd8c70599c3fbf09b77a890b2e2 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,6 +20,7 @@
 require "yaml"
 require "securerandom"
 
 require "yaml"
 require "securerandom"
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"


@@ -27,55 +28,137 @@ include_recipe "git"
 include_recipe "memcached"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "memcached"
 include_recipe "mysql"
 include_recipe "nodejs"

+include_recipe "php::fpm"
+include_recipe "podman"

 include_recipe "postgresql"
 include_recipe "python"
 include_recipe "postgresql"
 include_recipe "python"

+include_recipe "ruby"

 
 package %w[
 
 package %w[

-  php
+  ant
+  apache2-dev
+  aria2
+  at
+  autoconf
+  automake
+  awscli
+  cmake
+  composer
+  curl
+  default-jdk-headless
+  default-jre-headless
+  eatmydata
+  fonts-dejavu
+  fonts-dejavu-core
+  fonts-dejavu-extra
+  fonts-droid-fallback
+  fonts-liberation
+  fonts-noto-mono
+  g++
+  gcc
+  gdal-bin
+  gfortran
+  gnuplot-nox
+  golang
+  graphviz
+  irssi
+  jq
+  libargon2-dev
+  libboost-date-time-dev
+  libboost-dev
+  libboost-filesystem-dev
+  libboost-locale-dev
+  libboost-program-options-dev
+  libboost-regex-dev
+  libboost-system-dev
+  libbrotli-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
+  luajit
+  lz4
+  lzip
+  lzop
+  mailutils
+  make
+  nano
+  ncftp
+  netcat-openbsd
+  osm2pgsql
+  osmium-tool
+  osmosis
+  pandoc
+  pandoc
+  pbzip2
+  php-apcu

   php-cgi
   php-cli
   php-curl
   php-db
   php-cgi
   php-cli
   php-curl
   php-db

-  php-fpm
+  php-gd
+  php-igbinary

   php-imagick
   php-imagick

+  php-intl
+  php-mbstring
+  php-memcache

   php-mysql
   php-pear
   php-pgsql
   php-sqlite3
   php-mysql
   php-pear
   php-pgsql
   php-sqlite3

+  php-xml
+  pigz

   pngcrush
   pngquant
   pngcrush
   pngquant

-  python
-  python-argparse
-  python-beautifulsoup
-  python-cheetah
-  python-dateutil
-  python-magic
-  python-psycopg2
-  python-gdal
-  g++
-  gcc
-  make
-  autoconf
-  automake
-  libtool
-  libfcgi-dev
-  libxml2-dev
-  libmemcached-dev
-  libboost-regex-dev
-  libboost-system-dev
-  libboost-program-options-dev
-  libboost-date-time-dev
-  libboost-filesystem-dev
-  libboost-locale-dev
-  libpqxx-dev
-  libcrypto++-dev
-  libyajl-dev
+  proj-bin
+  pyosmium
+  python-is-python3
+  python3
+  python3-brotli
+  python3-bs4
+  python3-cheetah
+  python3-dateutil
+  python3-dev
+  python3-dotenv
+  python3-gdal
+  python3-geojson
+  python3-lxml
+  python3-lz4
+  python3-magic
+  python3-pil
+  python3-psycopg2
+  python3-pyproj
+  python3-venv
+  r-base
+  redis
+  tmux
+  unrar
+  unzip
+  whois
+  zip

   zlib1g-dev
 ]
 
   zlib1g-dev
 ]
 

-nodejs_package "svgo"
+# Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data
+execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do
+  command "projsync --file uk_os_OSTN15_NTv2_OSGBtoETRS.tif --system-directory"
+  not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") }
+end

 
 

-python_package "geojson"
+nodejs_package "svgo"

 
 apache_module "env"
 apache_module "expires"
 
 apache_module "env"
 apache_module "expires"


@@ -85,38 +168,35 @@ apache_module "proxy_fcgi"
 apache_module "rewrite"
 apache_module "suexec"
 apache_module "userdir"
 apache_module "rewrite"
 apache_module "suexec"
 apache_module "userdir"

-apache_module "wsgi"
-
-package "apache2-suexec-pristine"

 
 

-service "php7.2-fpm" do
-  action [:enable, :start]
+apache_module "wsgi" do
+  package "libapache2-mod-wsgi-py3"

 end
 
 end
 

-template "/etc/php/7.2/fpm/pool.d/default.conf" do
-  source "fpm-default.conf.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :reload, "service[php7.2-fpm]"
+package "apache2-suexec-pristine"
+
+php_fpm "default" do
+  pm_max_children 10
+  pm_start_servers 4
+  pm_min_spare_servers 2
+  pm_max_spare_servers 6

 end
 
 end
 

-file "/etc/php/7.2/fpm/pool.d/www.conf" do
+php_fpm "www" do

   action :delete
   action :delete

-  notifies :reload, "service[php7.2-fpm]"

 end
 
 directory "/srv/dev.openstreetmap.org" do
   owner "root"
   group "root"
 end
 
 directory "/srv/dev.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 template "/srv/dev.openstreetmap.org/index.html" do
   source "dev.html.erb"
   owner "root"
   group "root"
 end
 
 template "/srv/dev.openstreetmap.org/index.html" do
   source "dev.html.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 ssl_certificate "dev.openstreetmap.org" do
 end
 
 ssl_certificate "dev.openstreetmap.org" do


@@ -134,7 +214,7 @@ template "/etc/phppgadmin/config.inc.php" do
   source "phppgadmin.conf.erb"
   owner "root"
   group "root"
   source "phppgadmin.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 file "/etc/apache2/conf.d/phppgadmin" do
 end
 
 file "/etc/apache2/conf.d/phppgadmin" do


@@ -160,15 +240,27 @@ search(:accounts, "*:*").each do |account|
 
   next unless File.directory?("#{user_home}/public_html")
 
 
   next unless File.directory?("#{user_home}/public_html")
 

-  port = 7000 + account["uid"].to_i
-
-  template "/etc/php/7.2/fpm/pool.d/#{name}.conf" do
-    source "fpm.conf.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-    variables :user => name, :port => port
-    notifies :reload, "service[php7.2-fpm]"
+  php_fpm name do
+    user name
+    group name
+    pm_max_children 10
+    pm_start_servers 4
+    pm_min_spare_servers 2
+    pm_max_spare_servers 6
+    pm_max_requests 10000
+    request_terminate_timeout 1800
+    environment "HOSTNAME" => "$HOSTNAME",
+                "PATH" => "/usr/local/bin:/usr/bin:/bin",
+                "TMP" => "/tmp",
+                "TMPDIR" => "/tmp",
+                "TEMP" => "/tmp"
+    php_values "max_execution_time" => "300",
+               "memory_limit" => "128M",
+               "post_max_size" => "32M",
+               "upload_max_filesize" => "32M"
+    php_admin_values "sendmail_path" => "/usr/sbin/sendmail -t -i -f #{name}@dev.openstreetmap.org",
+                     "open_basedir" => "/home/#{name}/:/tmp/:/usr/share/php/"
+    php_flags "display_errors" => "on"

   end
 
   ssl_certificate "#{name}.dev.openstreetmap.org" do
   end
 
   ssl_certificate "#{name}.dev.openstreetmap.org" do


@@ -179,21 +271,25 @@ search(:accounts, "*:*").each do |account|
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"
   apache_site "#{name}.dev.openstreetmap.org" do
     template "apache.user.erb"
     directory "#{user_home}/public_html"

-    variables :user => name, :port => port
+    variables :user => name

   end
 
   template "/etc/sudoers.d/#{name}" do
     source "sudoers.user.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/sudoers.d/#{name}" do
     source "sudoers.user.erb"
     owner "root"
     group "root"

-    mode 0o440
+    mode "440"

     variables :user => name
   end
 end
 
     variables :user => name
   end
 end
 

-if node[:postgresql][:clusters][:"9.5/main"]
+node[:postgresql][:versions].each do |version|
+  package "postgresql-#{version}-postgis-3"
+end
+
+if node[:postgresql][:clusters][:"15/main"]

   postgresql_user "apis" do
   postgresql_user "apis" do

-    cluster "9.5/main"
+    cluster "15/main"

   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do


@@ -201,23 +297,25 @@ if node[:postgresql][:clusters][:"9.5/main"]
     source "cleanup-assets.erb"
     owner "root"
     group "root"
     source "cleanup-assets.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 
   end
 

-  ruby_version = node[:passenger][:ruby_version]
-

   systemd_service "rails-jobs@" do
     description "Rails job queue runner"
     type "simple"
   systemd_service "rails-jobs@" do
     description "Rails job queue runner"
     type "simple"

+    environment_file "/etc/default/rails-%i"

     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"

-    exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"
+    exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"

     restart "on-failure"
     restart "on-failure"

-    private_tmp true
-    private_devices true
-    protect_system "full"
-    protect_home true
-    no_new_privileges true
+    nice 10
+    sandbox :enable_network => true
+    restrict_address_families "AF_UNIX"
+    memory_deny_write_execute false
+    read_write_paths [
+      "/srv/%i.apis.dev.openstreetmap.org/logs",
+      "/srv/%i.apis.dev.openstreetmap.org/rails/storage"
+    ]

   end
 
   systemd_service "cgimap@" do
   end
 
   systemd_service "cgimap@" do


@@ -225,17 +323,20 @@ if node[:postgresql][:clusters][:"9.5/main"]
     type "forking"
     environment_file "/etc/default/cgimap-%i"
     user "apis"
     type "forking"
     environment_file "/etc/default/cgimap-%i"
     user "apis"

-    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --port $CGIMAP_PORT --instances 5"
+    group "www-data"
+    umask "0002"
+    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/build/openstreetmap-cgimap --daemon --instances 5"

     exec_reload "/bin/kill -HUP $MAINPID"
     exec_reload "/bin/kill -HUP $MAINPID"

-    private_tmp true
-    private_devices true
-    protect_system "full"
-    protect_home true
-    no_new_privileges true
+    runtime_directory "cgimap-%i"
+    sandbox :enable_network => true
+    restrict_address_families "AF_UNIX"
+    read_write_paths ["/srv/%i.apis.dev.openstreetmap.org/logs", "/srv/%i.apis.dev.openstreetmap.org/rails/tmp"]

     restart "on-failure"
   end
 
     restart "on-failure"
   end
 

-  cgimap_port = 9000
+  Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir|
+    node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {}
+  end

 
   node[:dev][:rails].each do |name, details|
     database_name = details[:database] || "apis_#{name}"
 
   node[:dev][:rails].each do |name, details|
     database_name = details[:database] || "apis_#{name}"


@@ -248,17 +349,15 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
     if details[:repository]
       site_aliases = details[:aliases] || []
 
     if details[:repository]
       site_aliases = details[:aliases] || []

-      secret_key_base = details[:secret_key_base] || SecureRandom.base64(96)
-
-      node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
+      secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")

 
       postgresql_database database_name do
 
       postgresql_database database_name do

-        cluster "9.5/main"
+        cluster "15/main"

         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do

-        cluster "9.5/main"
+        cluster "15/main"

         database database_name
         extension "btree_gist"
       end
         database database_name
         extension "btree_gist"
       end


@@ -266,65 +365,80 @@ if node[:postgresql][:clusters][:"9.5/main"]
       directory site_directory do
         owner "apis"
         group "apis"
       directory site_directory do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory log_directory do
         owner "apis"
         group "apis"
       end
 
       directory log_directory do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory gpx_directory do
         owner "apis"
         group "apis"
       end
 
       directory gpx_directory do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory "#{gpx_directory}/traces" do
         owner "apis"
         group "apis"
       end
 
       directory "#{gpx_directory}/traces" do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"

       end
 
       directory "#{gpx_directory}/images" do
         owner "apis"
         group "apis"
       end
 
       directory "#{gpx_directory}/images" do
         owner "apis"
         group "apis"

-        mode 0o755
+        mode "755"
+      end
+
+      openssl_rsa_private_key "#{site_directory}/doorkeeper.key" do
+        owner "root"
+        group "root"
+        mode "0400"

       end
 
       rails_port site_name do
       end
 
       rails_port site_name do

-        ruby ruby_version

         directory rails_directory
         user "apis"
         group "apis"
         repository details[:repository]
         revision details[:revision]
         directory rails_directory
         user "apis"
         group "apis"
         repository details[:repository]
         revision details[:revision]

-        database_port node[:postgresql][:clusters][:"9.5/main"][:port]
+        database_port node[:postgresql][:clusters][:"15/main"][:port]

         database_name database_name
         database_username "apis"
         database_name database_name
         database_username "apis"

+        email_from "OpenStreetMap <web@noreply.openstreetmap.org>"

         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
         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

+        doorkeeper_signing_key lazy { File.read("#{site_directory}/doorkeeper.key") }

       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"
       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"

-        mode 0o644
+        mode "644"

         variables :site => site_name
         notifies :restart, "rails_port[#{site_name}]"
       end
 
         variables :site => site_name
         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
         subscribes :restart, "rails_port[#{site_name}]"
       service "rails-jobs@#{name}" do
         action [:enable, :start]
         supports :restart => true
         subscribes :restart, "rails_port[#{site_name}]"

-        subscribes :restart, "systemd_service[#{name}]"
+        subscribes :restart, "systemd_service[rails-jobs@]"

         only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
       end
 
         only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
       end
 


@@ -337,48 +451,47 @@ if node[:postgresql][:clusters][:"9.5/main"]
           group "apis"
         end
 
           group "apis"
         end
 

-        execute "#{cgimap_directory}/autogen.sh" do
-          action :nothing
-          command "./autogen.sh"
-          cwd cgimap_directory
+        directory "#{cgimap_directory}/build" do

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "git[#{cgimap_directory}]", :immediate
+          mode "0755"

         end
 
         end
 

-        execute "#{cgimap_directory}/configure" do
+        execute "#{cgimap_directory}/CMakeLists.txt" do

           action :nothing
           action :nothing

-          command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu --enable-yajl"
-          cwd cgimap_directory
+          command "cmake .."
+          cwd "#{cgimap_directory}/build"

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediate
+          subscribes :run, "git[#{cgimap_directory}]", :immediately

         end
 
         end
 

-        execute "#{cgimap_directory}/Makefile" do
+        execute "#{cgimap_directory}/build/Makefile" do

           action :nothing
           command "make -j"
           action :nothing
           command "make -j"

-          cwd cgimap_directory
+          cwd "#{cgimap_directory}/build"

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate
-          notifies :restart, "service[cgimap@#{name}]"
+          subscribes :run, "execute[#{cgimap_directory}/CMakeLists.txt]", :immediately

         end
 
         template "/etc/default/cgimap-#{name}" do
           source "cgimap.environment.erb"
           owner "root"
           group "root"
         end
 
         template "/etc/default/cgimap-#{name}" do
           source "cgimap.environment.erb"
           owner "root"
           group "root"

-          mode 0o640
-          variables :cgimap_port => cgimap_port,
-                    :database_port => node[:postgresql][:clusters][:"9.5/main"][:port],
+          mode "640"
+          variables :cgimap_socket => "/run/cgimap-#{name}/socket",
+                    :database_port => node[:postgresql][:clusters][:"15/main"][:port],

                     :database_name => database_name,
                     :database_name => database_name,

-                    :log_directory => log_directory
-          notifies :restart, "service[cgimap@#{name}]"
+                    :log_directory => log_directory,
+                    :options => details[:cgimap_options]

         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]
         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]

+          subscribes :restart, "execute[#{cgimap_directory}/build/Makefile]"
+          subscribes :restart, "template[/etc/default/cgimap-#{name}]"
+          subscribes :restart, "systemd_service[cgimap@]"

         end
       end
 
         end
       end
 


@@ -393,20 +506,18 @@ if node[:postgresql][:clusters][:"9.5/main"]
                   :aliases => site_aliases,
                   :secret_key_base => secret_key_base,
                   :cgimap_enabled => details.key?(:cgimap_repository),
                   :aliases => site_aliases,
                   :secret_key_base => secret_key_base,
                   :cgimap_enabled => details.key?(:cgimap_repository),

-                  :cgimap_port => cgimap_port
+                  :cgimap_socket => "/run/cgimap-#{name}/socket"

       end
 
       template "/etc/logrotate.d/apis-#{name}" do
         source "logrotate.apis.erb"
         owner "root"
         group "root"
       end
 
       template "/etc/logrotate.d/apis-#{name}" do
         source "logrotate.apis.erb"
         owner "root"
         group "root"

-        mode 0o644
+        mode "644"

         variables :name => name,
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
       end
         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
     else
       file "/etc/logrotate.d/apis-#{name}" do
         action :delete


@@ -424,6 +535,10 @@ if node[:postgresql][:clusters][:"9.5/main"]
         action :delete
       end
 
         action :delete
       end
 

+      service "rails-jobs@#{name}" do
+        action [:stop, :disable]
+      end
+

       directory site_directory do
         action :delete
         recursive true
       directory site_directory do
         action :delete
         recursive true


@@ -435,24 +550,22 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "9.5/main"
+        cluster "15/main"

       end
       end

-
-      node.normal[:dev][:rails].delete(name)

     end
   end
 
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"
     end
   end
 
   directory "/srv/apis.dev.openstreetmap.org" do
     owner "apis"
     group "apis"

-    mode 0o755
+    mode "755"

   end
 
   template "/srv/apis.dev.openstreetmap.org/index.html" do
     source "apis.html.erb"
     owner "apis"
     group "apis"
   end
 
   template "/srv/apis.dev.openstreetmap.org/index.html" do
     source "apis.html.erb"
     owner "apis"
     group "apis"

-    mode 0o644
+    mode "644"

   end
 
   ssl_certificate "apis.dev.openstreetmap.org" do
   end
 
   ssl_certificate "apis.dev.openstreetmap.org" do


@@ -463,29 +576,22 @@ if node[:postgresql][:clusters][:"9.5/main"]
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end

-
-  node[:postgresql][:clusters].each_key do |name|
-    postgresql_munin name do
-      cluster name
-      database "ALL"
-    end
-  end

 end
 
 directory "/srv/ooc.openstreetmap.org" do
   owner "root"
   group "root"
 end
 
 directory "/srv/ooc.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 remote_directory "/srv/ooc.openstreetmap.org/html" do
   source "ooc"
   owner "root"
   group "root"
 end
 
 remote_directory "/srv/ooc.openstreetmap.org/html" do
   source "ooc"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 ssl_certificate "ooc.openstreetmap.org" do
 end
 
 ssl_certificate "ooc.openstreetmap.org" do


@@ -499,3 +605,16 @@ end
 apache_site "ooc.openstreetmap.org" do
   template "apache.ooc.erb"
 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