X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=985620fa598507b4e58d6558a4a0ca4bfac07f77;hb=6e66642ee331bbcafad68b2d3606321a9d337a83;hp=b0bde41343c43f45911ac3e8c3c3e5ffdac97b7b;hpb=b529b139a60ea8355089511737c8264185d8d074;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b0bde4134..985620fa5 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -39,10 +39,6 @@ class apache2 {
 		ensure => absent,
 	}
 
-	apache2::config { 'ressource-limits':
-		ensure => absent,
-	}
-
 	if has_role('udd') {
 		$memlimit = 512 * 1024 * 1024
 	} elsif has_role('dgit_git') {
@@ -97,6 +93,10 @@ class apache2 {
 		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 }
@@ -132,6 +132,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 => '',
@@ -177,4 +181,15 @@ class apache2 {
 		content => template('apache2/ssl-key-pins.erb'),
 		notify  => Exec['service apache2 reload'],
 	}
+
+	file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
+	concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @(EOF)
+			*/2 * * * * root mkdir -p /run/dsa/shutdown-marker; if dsa-is-shutdown-scheduled; then echo 'system-in-shutdown' > /run/dsa/shutdown-marker/shutdown-in-progress; else rm -f /run/dsa/shutdown-marker/shutdown-in-progress; fi
+			| EOF
+	}
+	apache2::config { 'local-scheduled-shutdown':
+		source	=> 'puppet:///modules/apache2/local-scheduled-shutdown',
+	}
 }