Move puppet-export-scheduled-shutdown into dsa-puppet-stuff

diff --git a/modules/apache2/files/cron-export-scheduled-shutdown b/modules/apache2/files/cron-export-scheduled-shutdown
deleted file mode 100644 (file)
index b1c09ec..0000000
--- 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 4f07934..6eb8c6b 100644 (file)
--- 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',