X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=9735570e6e830597e3f1d7e92bc8bebf50df17b9;hb=7969d6764f067dc0002e1ad54e568db69709ffef;hp=cd4f1f7bdcb7099cff15c4367627e398331f42a1;hpb=d5860b0cc2d81d2332b8035b1a279a7fafda4890;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index cd4f1f7bd..9735570e6 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -16,6 +16,7 @@ class apache2 {
 		require => Package['apache2'],
 	}
 
+	apache2::module { 'reqtimeout': }
 	apache2::module { 'info': }
 	apache2::module { 'status': }
 	apache2::module { 'headers': }
@@ -92,6 +93,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'),
@@ -131,6 +140,10 @@ class apache2 {
 	munin::check { 'ps_apache2':
 		script => 'ps_',
 	}
+	# The munin script needs this
+	package { 'libwww-perl':
+		ensure => installed,
+	}
 
 	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
 		include apache2::dynamic