From: Julien Cristau Date: Mon, 7 Aug 2017 22:56:01 +0000 (-0400) Subject: Move shutdown marker around X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f403ded6ab91666029af18595ce44bf1797d1226;p=mirror%2Fdsa-puppet.git Move shutdown marker around --- diff --git a/modules/apache2/files/cron-export-scheduled-shutdown b/modules/apache2/files/cron-export-scheduled-shutdown index 213aa801d..0b280db53 100644 --- a/modules/apache2/files/cron-export-scheduled-shutdown +++ b/modules/apache2/files/cron-export-scheduled-shutdown @@ -1,2 +1,2 @@ PATH=/usr/local/bin:/usr/bin:/bin -*/2 root if dsa-is-shutdown-scheduled; then echo 'system-in-shutdown' > /srv/www/default.debian.org/htdocs/shutdown-in-progress ; else rm -f /srv/www/default.debian.org/htdocs/shutdown-in-progress; fi +*/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 diff --git a/modules/apache2/files/local-scheduled-shutdown b/modules/apache2/files/local-scheduled-shutdown index 53038713a..06895549b 100644 --- a/modules/apache2/files/local-scheduled-shutdown +++ b/modules/apache2/files/local-scheduled-shutdown @@ -1 +1,4 @@ -Alias /shutdown-in-progress /srv/www/default.debian.org/htdocs/shutdown-in-progress + + Require all granted + +Alias /shutdown-in-progress /run/dsa/shutdown-marker/shutdown-in-progress