Fix stomping of certfile

[dsa-puppet.git] / modules / apache2 / templates / mpm_worker.erb

diff --git a/modules/apache2/templates/mpm_worker.erb b/modules/apache2/templates/mpm_worker.erb
index 3c0b0eb27100e111c0c48466d5cfcb5634000547..952599841ac5f1a305b550981897ab64ed266e8c 100644 (file)
--- a/modules/apache2/templates/mpm_worker.erb
+++ b/modules/apache2/templates/mpm_worker.erb
@@ -7,26 +7,40 @@
 # MinSpareThreads: minimum number of worker threads which are kept spare
 # MaxSpareThreads: maximum number of worker threads which are kept spare
 # ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
-#                        graceful restart. ThreadLimit can only be changed by stopping
-#                        and starting Apache.
+#              graceful restart. ThreadLimit can only be changed by stopping
+#              and starting Apache.
 # ThreadsPerChild: constant number of worker threads in each server process
 # MaxRequestWorkers: maximum number of threads
 # MaxConnectionsPerChild: maximum number of requests a server process serves
 
+# default config:
+#    StartServers              2
+#    MinSpareThreads          25
+#    MaxSpareThreads          75
+#    ThreadLimit              64
+#    ThreadsPerChild          25
+#    MaxRequestWorkers       150
+#    MaxConnectionsPerChild    0
+
 <IfModule mpm_worker_module>
-       #StartServers                    2
-       #MinSpareThreads                 25
-       #MaxSpareThreads                 75
-       #ThreadLimit                     64
-       #ThreadsPerChild                 25
-       #MaxRequestWorkers        150
-       #MaxConnectionsPerChild   0
-       ServerLimit                30
-       MaxRequestWorkers        1500
-       ThreadsPerChild            50
-       MinSpareThreads            20
-       MaxSpareThreads            75
-       MaxConnectionsPerChild  1000000
+<% if scope.function_has_role(['bugs_base']) or
+      scope.function_has_role(['popcon'])
+      -%>
+    StartServers                 2
+    MinSpareThreads             25
+    MaxSpareThreads             75
+    ThreadLimit                 64
+    ThreadsPerChild             25
+    MaxRequestWorkers          150
+    MaxConnectionsPerChild   10000
+<% else -%>
+    ServerLimit                 30
+    MaxRequestWorkers         1500
+    ThreadsPerChild             50
+    MinSpareThreads             20
+    MaxSpareThreads             75
+    MaxConnectionsPerChild 1000000
+<% end -%>
 </IfModule>
 
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
+# vim: syntax=apache ts=4 sw=4 sts=4 sr et