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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 707cd1389..4f07934cb 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,7 +90,15 @@ 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',
 	}
 
 	apache2::module { 'mpm_event': ensure => absent }
@@ -100,7 +109,7 @@ class apache2 {
 		apache2::module { 'mpm_prefork': ensure => absent }
 		apache2::module { 'mpm_worker': }
 	}
-	if $::lsbmajdistrelease > 7 {
+	if versioncmp($::lsbmajdistrelease, '7') > 0 {
 		file { '/etc/apache2/mods-available/mpm_worker.conf':
 			content => template('apache2/mpm_worker.erb'),
 		}
@@ -127,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 => '',
@@ -172,4 +185,11 @@ class apache2 {
 		content => template('apache2/ssl-key-pins.erb'),
 		notify  => Exec['service apache2 reload'],
 	}
+
+	file { '/etc/cron.d/puppet-export-scheduled-shutdown':
+		source	=> 'puppet:///modules/apache2/cron-export-scheduled-shutdown',
+	}
+	apache2::config { 'local-scheduled-shutdown':
+		source	=> 'puppet:///modules/apache2/local-scheduled-shutdown',
+	}
 }