X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=4f07934cb081a915933b4f4f61320528527c9be1;hb=33397101fdded2f7c0b5aed18a2a931736e8c1fd;hp=a3db477e59de08da88f4b92dbb1d25ecc58166cf;hpb=552aed40f6b02e57e9bc6f560e84f767c535d3b4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a3db477e5..4f07934cb 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,26 @@ class apache2 {
 	}
 
 	apache2::config { 'pratchett':
-		source => 'puppet:///modules/apache2/pratchett',
+		ensure => 'absent',
+	}
+
+	apache2::config { 'headers':
+		source => 'puppet:///modules/apache2/headers',
+	}
+
+	apache2::config { 'disabled-service':
+		source => 'puppet:///modules/apache2/disabled-service',
 	}
 
-	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'),
 		}
@@ -126,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 => '',
@@ -138,8 +152,12 @@ 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-1and1,pkgmirror-csail] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
@@ -163,19 +181,15 @@ class apache2 {
 		require =>  Package['apache2'],
 	}
 
-	concat { '/etc/apache2/conf-available/puppet-ssl-key-pins.conf':
-		owner   => root,
-		group   => root,
-		mode    => '0644',
-		require =>  Package['apache2'],
+	apache2::config { 'puppet-ssl-key-pins':
+		content => template('apache2/ssl-key-pins.erb'),
 		notify  => Exec['service apache2 reload'],
 	}
-	concat::fragment { 'puppet-ssl-key-pins-header':
-		target => '/etc/apache2/conf-available/puppet-ssl-key-pins.conf',
-		content => '',
-		order  => 00,
+
+	file { '/etc/cron.d/puppet-export-scheduled-shutdown':
+		source	=> 'puppet:///modules/apache2/cron-export-scheduled-shutdown',
 	}
-	apache2::config { 'puppet-ssl-key-pins':
-		nocontentok => true,
+	apache2::config { 'local-scheduled-shutdown':
+		source	=> 'puppet:///modules/apache2/local-scheduled-shutdown',
 	}
 }