From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 9 Oct 2019 08:53:52 +0000 (+0200)
Subject: Remove local-scheduled-shutdown check
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2d1ec427e3c71ed97101e3dc53b8ece95624d67f;p=mirror%2Fdsa-puppet.git

Remove local-scheduled-shutdown check

We had a cronjob that would run dsa-is-shutdown-scheduled every two
minutes and touch a file in /run that was then exposed via apache
as /shutdown-in-progress.  However, nothing appears to use this.
In particular, the fastly health checker uses /_health which is
backed by a service specific health service.
---

diff --git a/modules/apache2/files/local-scheduled-shutdown b/modules/apache2/files/local-scheduled-shutdown
deleted file mode 100644
index 06895549b..000000000
--- a/modules/apache2/files/local-scheduled-shutdown
+++ /dev/null
@@ -1,4 +0,0 @@
-<Directory /run/dsa/shutdown-marker>
-	Require all granted
-</Directory>
-Alias /shutdown-in-progress /run/dsa/shutdown-marker/shutdown-in-progress
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 64bf7ffc8..95ccf82db 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -170,6 +170,6 @@ class apache2(
   }
 
   apache2::config { 'local-scheduled-shutdown':
-    source => 'puppet:///modules/apache2/local-scheduled-shutdown',
+    ensure => 'absent',
   }
 }
diff --git a/modules/webserver/manifests/init.pp b/modules/webserver/manifests/init.pp
index 19afd271b..e5b91401b 100644
--- a/modules/webserver/manifests/init.pp
+++ b/modules/webserver/manifests/init.pp
@@ -1,12 +1,4 @@
 #
 class webserver {
 	include webserver::defaultpage
-
-	file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
-	concat::fragment { 'puppet-crontab--webserver-export-shutdown':
-		target => '/etc/cron.d/puppet-crontab',
-		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
-	}
 }