From: Julien Cristau <jcristau@debian.org>
Date: Wed, 16 Jan 2019 07:08:07 +0000 (+0100)
Subject: Bump RLimitNPROC for bugs web hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=17593e407b232569513785262043a0e0bda75e0f;p=mirror%2Fdsa-puppet.git

Bump RLimitNPROC for bugs web hosts

Bug#919316
---

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