Set memory limits for user slices on the dev server

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 907a4eb463c07f7642a5d0365ffd7cb4ff201744..4723770439f84aac11073de3e93a0358c71e1bd1 100644 (file)
--- 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
@@ -456,7 +465,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 +596,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