From 61e41608b123700be4cca1cde42c4e38d7fb0078 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 25 Dec 2017 12:08:57 +0100 Subject: [PATCH] Move puppet-export-scheduled-shutdown into dsa-puppet-stuff --- modules/apache2/files/cron-export-scheduled-shutdown | 2 -- modules/apache2/manifests/init.pp | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 modules/apache2/files/cron-export-scheduled-shutdown diff --git a/modules/apache2/files/cron-export-scheduled-shutdown b/modules/apache2/files/cron-export-scheduled-shutdown deleted file mode 100644 index b1c09ec88..000000000 --- a/modules/apache2/files/cron-export-scheduled-shutdown +++ /dev/null @@ -1,2 +0,0 @@ -PATH=/usr/local/bin:/usr/bin:/bin -*/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/manifests/init.pp b/modules/apache2/manifests/init.pp index 4f07934cb..6eb8c6bd7 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -187,7 +187,13 @@ class apache2 { } file { '/etc/cron.d/puppet-export-scheduled-shutdown': - source => 'puppet:///modules/apache2/cron-export-scheduled-shutdown', + ensure => absent, + } + concat::fragment { 'dsa-puppet-stuff--apache-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 } apache2::config { 'local-scheduled-shutdown': source => 'puppet:///modules/apache2/local-scheduled-shutdown', -- 2.20.1