projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fqdn in name
[mirror/dsa-puppet.git]
/
modules
/
webserver
/
manifests
/
init.pp
diff --git
a/modules/webserver/manifests/init.pp
b/modules/webserver/manifests/init.pp
index
f73f8df
..
19afd27
100644
(file)
--- a/
modules/webserver/manifests/init.pp
+++ b/
modules/webserver/manifests/init.pp
@@
-3,8
+3,8
@@
class webserver {
include webserver::defaultpage
file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
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
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