From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 19 Aug 2018 09:38:57 +0000 (+0200)
Subject: Move creation of /run/dsa/shutdown-marker to a new common webserver module
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1795fd9783dafaaf24a229f7d6bd82df0e47eee8;p=mirror%2Fdsa-puppet.git

Move creation of /run/dsa/shutdown-marker to a new common webserver module
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 5fa11d405..ce7c9273b 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -7,6 +7,8 @@
 #   include apache2
 #
 class apache2 {
+	include webserver
+
 	package { 'apache2':
 		ensure => installed,
 	}
@@ -182,13 +184,6 @@ class apache2 {
 		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',
 	}
diff --git a/modules/webserver/manifests/init.pp b/modules/webserver/manifests/init.pp
new file mode 100644
index 000000000..6ffcfaaf6
--- /dev/null
+++ b/modules/webserver/manifests/init.pp
@@ -0,0 +1,10 @@
+#
+class webserver {
+	file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
+	concat::fragment { 'dsa-puppet-stuff--webserver-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
+	}
+}