Bump RLimitNPROC for bugs web hosts

Bug#919316

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 5f289cb..b508416 100644 (file)
--- 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 10c6b41..d4da647 100644 (file)
--- 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 %>