X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=f3a598b4aa3a4fc022b446c460d17e3c494dd3ce;hb=44688b3127634f8a9369c6419f45a706a39ee628;hp=f279cde4c34f0681c38f458cc80e98c9f67e8ca7;hpb=3628350798e85b25012ebd69eebdaf93b7d43556;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index f279cde4c..f3a598b4a 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -97,6 +97,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 }
@@ -181,4 +185,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',
+	}
 }