X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=707cd1389b62db70ec36e86ed6e6954beb18ccf2;hb=f97bd2a2a0cccb68e4de5e8cca2ebaebab0ab153;hp=32d35ebddf9b449cce01a9b7d592758643f579c7;hpb=5083da5173386c399ea29d1a88a7366e9aa52a14;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 32d35ebdd..707cd1389 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -92,6 +92,14 @@ class apache2 {
 		source => 'puppet:///modules/apache2/pratchett',
 	}
 
+	apache2::module { 'mpm_event': ensure => absent }
+	if has_role('apache_prefork') {
+		apache2::module { 'mpm_worker': ensure => absent }
+		apache2::module { 'mpm_prefork': }
+	} else {
+		apache2::module { 'mpm_prefork': ensure => absent }
+		apache2::module { 'mpm_worker': }
+	}
 	if $::lsbmajdistrelease > 7 {
 		file { '/etc/apache2/mods-available/mpm_worker.conf':
 			content => template('apache2/mpm_worker.erb'),