MPM selection

diff --git a/manifests/init.pp b/manifests/init.pp
index cbd80079cc8d42e695ac6b775beefd8562577b62..8869a8ba6407057cf6f3b8082b9943f624ae5ee3 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -42,6 +42,7 @@ class apache(
   $https_port     = '443',
   $default_user   = 'www-data',
   $default_group  = 'www-data',
+  $mpm            = 'itk',
 ) {
 
   include ssl
@@ -107,16 +108,29 @@ class apache(
     require => Package["apache"],
   }
 
-  # Conflicts with mpm_itk
-  apache::module { "mpm_event":
-    ensure => absent,
+  # MPM selection
+  # There could be only one
+
+  apache::module { "mpm_worker":
+    ensure  => $mpm ? {
+      'worker' => present,
+      default  => absent,
+    },
     require => Package['apache'],
   }
 
+  apache::module { "mpm_event":
+    ensure  => $mpm ? {
+      'event' => present,
+      default => absent,
+    },
+    require => [ Package['apache'], Apache::Module['mpm_worker'] ],
+  }
+
   apache::module { "mpm_itk":
-    ensure  => $::lsbdistcodename ? {
-      wheezy  => absent,
-      default => present,
+    ensure  => $mpm ? {
+      'itk'   => present,
+      default => absent,
     },
     require => [ Package['apache', 'libapache2-mpm-itk'], Apache::Module['mpm_event'] ],
   }