From: Julien Cristau <jcristau@debian.org>
Date: Mon, 6 Jul 2015 15:00:16 +0000 (+0200)
Subject: Revert "Revert "small number of apaches on popcon host""
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e5381943b44e72f57fe9a59829641704eee28824;p=mirror%2Fdsa-puppet.git

Revert "Revert "small number of apaches on popcon host""

This reverts commit bf307e7702505ca016fdb25fef4c1d34a6f6f84f.

The host goes crazy with too many apache and popcon processes eating all
memory.
---

diff --git a/modules/apache2/templates/mpm_worker.erb b/modules/apache2/templates/mpm_worker.erb
index 9a0a2d3fe..952599841 100644
--- a/modules/apache2/templates/mpm_worker.erb
+++ b/modules/apache2/templates/mpm_worker.erb
@@ -23,7 +23,9 @@
 #    MaxConnectionsPerChild    0
 
 <IfModule mpm_worker_module>
-<% if scope.function_has_role(['bugs_base']) -%>
+<% if scope.function_has_role(['bugs_base']) or
+      scope.function_has_role(['popcon'])
+      -%>
     StartServers                 2
     MinSpareThreads             25
     MaxSpareThreads             75