X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=b0bde41343c43f45911ac3e8c3c3e5ffdac97b7b;hb=69e48f13d90588d81f1513e0e0155008ae82b287;hp=15a2a341c86eb5bfe3f1164e94ee69c6ba974a34;hpb=3813b782e921aaebc7534886a293ea037c06b948;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 15a2a341c..b0bde4134 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -16,17 +16,11 @@ class apache2 {
 		require => Package['apache2'],
 	}
 
+	apache2::module { 'reqtimeout': }
 	apache2::module { 'info': }
 	apache2::module { 'status': }
 	apache2::module { 'headers': }
-
-	package { 'libapache2-mod-macro':
-		ensure => installed
-	}
-
-	apache2::module { 'macro':
-		require => Package['libapache2-mod-macro']
-	}
+	apache2::module { 'macro': }
 
 	apache2::site { '00-default':
 		site     => 'default-debian.org',
@@ -96,10 +90,22 @@ class apache2 {
 	}
 
 	apache2::config { 'pratchett':
-		source => 'puppet:///modules/apache2/pratchett',
+		ensure => 'absent',
+	}
+
+	apache2::config { 'headers':
+		source => 'puppet:///modules/apache2/headers',
 	}
 
-	if $::lsbmajdistrelease > 7 {
+	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 versioncmp($::lsbmajdistrelease, '7') > 0 {
 		file { '/etc/apache2/mods-available/mpm_worker.conf':
 			content => template('apache2/mpm_worker.erb'),
 		}
@@ -138,6 +144,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