apache2: configure mpm_worker module on jessie hosts

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/apache2/files/mpm_worker b/modules/apache2/files/mpm_worker
new file mode 100644 (file)
index 0000000..0df6665
--- /dev/null
+++ b/modules/apache2/files/mpm_worker
@@ -0,0 +1,32 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+##
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# 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.
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestWorkers: maximum number of threads
+# MaxConnectionsPerChild: maximum number of requests a server process serves
+
+<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  10000
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8d0ffdf3f0e18dd04b3757515920410c47ccb206..cb8d1d7a9efadc9e8352f78d0433ed621bfecc70 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -87,6 +87,12 @@ class apache2 {
                source => 'puppet:///modules/apache2/pratchett',
        }
 
+       if $::lsbmajdistrelease > 7 {
+               file { '/etc/apache2/mods-available/mpm_worker.conf':
+                       source => 'puppet:///modules/apache2/mpm_worker',
+               }
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }