Move shutdown marker around

diff --git a/modules/apache2/files/cron-export-scheduled-shutdown b/modules/apache2/files/cron-export-scheduled-shutdown
index 213aa80..0b280db 100644 (file)
--- 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 5303871..0689554 100644 (file)
--- 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
+<Directory /run/dsa/shutdown-marker>
+       Require all granted
+</Directory>
+Alias /shutdown-in-progress /run/dsa/shutdown-marker/shutdown-in-progress