summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp26
1 files changed, 20 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index cbd8007..8869a8b 100644
--- 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'] ],
}