From 17593e407b232569513785262043a0e0bda75e0f Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 16 Jan 2019 08:08:07 +0100 Subject: [PATCH] Bump RLimitNPROC for bugs web hosts Bug#919316 --- modules/apache2/manifests/init.pp | 6 ++++++ modules/apache2/templates/resource-limits.erb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 5f289cb38..b5084160d 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -54,6 +54,12 @@ class apache2 { } else { $memlimit = 192 * 1024 * 1024 } + # debbugs cgis like to fork and don't deal well with EAGAIN + if has_role('bugs_base') { + $proclimit = 450 + } else { + $proclimit = 256 + } apache2::config { 'resource-limits': content => template('apache2/resource-limits.erb'), diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb index 10c6b41a2..d4da647dc 100644 --- a/modules/apache2/templates/resource-limits.erb +++ b/modules/apache2/templates/resource-limits.erb @@ -5,4 +5,4 @@ RLimitCPU 180 RLimitMEM <%= @memlimit %> -RLimitNPROC 256 +RLimitNPROC <%= @proclimit %> -- 2.20.1