X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fwebserver%2Fmanifests%2Finit.pp;h=1a7844a0bfaea8dfee14ec9202defa997e17a256;hb=421d51cedb758b5a27a89b5c458562f9c279cbc3;hp=19afd271b175e2c477b84782aaccde2947fb59ef;hpb=168aa3f05f914802698b8db5fdde823c4e992913;p=mirror%2Fdsa-puppet.git diff --git a/modules/webserver/manifests/init.pp b/modules/webserver/manifests/init.pp index 19afd271b..1a7844a0b 100644 --- a/modules/webserver/manifests/init.pp +++ b/modules/webserver/manifests/init.pp @@ -1,12 +1,5 @@ +# base webserver class. Currently only ships a default page # 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 - } + include webserver::defaultpage }