X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=129c9d584672d8fccfcde7435e13c06665ae0b75;hb=25796b13e329fe9fa636c195aeaec518eb511541;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..129c9d584 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': }
@@ -89,10 +90,26 @@ class apache2 {
 	}
 
 	apache2::config { 'pratchett':
-		source => 'puppet:///modules/apache2/pratchett',
+		ensure => 'absent',
 	}
 
-	if $::lsbmajdistrelease > 7 {
+	apache2::config { 'headers':
+		source => 'puppet:///modules/apache2/headers',
+	}
+
+	apache2::config { 'disabled-service':
+		source => 'puppet:///modules/apache2/disabled-service',
+	}
+
+	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'),
 		}
@@ -119,6 +136,10 @@ class apache2 {
 		content => template('apache2/disabled-index.html'),
 	}
 
+	file { '/var/log/apache2':
+		ensure => directory,
+		mode   => '0755',
+	}
 	file { '/var/log/apache2/.nobackup':
 		mode    => '0644',
 		content => '',