X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fwebserver%2Fmanifests%2Finit.pp;h=19afd271b175e2c477b84782aaccde2947fb59ef;hb=5798c1ac4a2c2bd8737087b515d0eb4869482576;hp=6ffcfaaf66e5c575f8390502b189e61bff7ead3e;hpb=1795fd9783dafaaf24a229f7d6bd82df0e47eee8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/webserver/manifests/init.pp b/modules/webserver/manifests/init.pp
index 6ffcfaaf6..19afd271b 100644
--- a/modules/webserver/manifests/init.pp
+++ b/modules/webserver/manifests/init.pp
@@ -1,8 +1,10 @@
 #
 class webserver {
+	include webserver::defaultpage
+
 	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',
+	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