X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fwebserver%2Fmanifests%2Finit.pp;h=e5b91401b5c7894a72dfb02e3ac51ed465062efd;hb=2d1ec427e3c71ed97101e3dc53b8ece95624d67f;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..e5b91401b 100644 --- a/modules/webserver/manifests/init.pp +++ b/modules/webserver/manifests/init.pp @@ -1,10 +1,4 @@ # 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 - } + include webserver::defaultpage }