Split header of puppet-nagios-wraps into own fragment, set orders

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 9f9114e..39e37d3 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -30,6 +30,7 @@ class hardware::raid::proliant {
                if $::smartarraycontroller_hpsa {
                        concat::fragment { 'dsa-check-hpssacli':
                                target => '/etc/cron.d/puppet-nagios-wraps',
+                               order  => '020',
                                content  => @(EOF)
                                        27 * * * * root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
                                        | EOF

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index b31cd60..45acf85 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -77,11 +77,18 @@ class nagios::client inherits nagios {
        }
 
        concat { '/etc/cron.d/puppet-nagios-wraps': }
-       concat::fragment { 'dsa-check_puppet_agent':
+       concat::fragment { 'puppet-nagios-wraps--header':
                target => '/etc/cron.d/puppet-nagios-wraps',
+               order  => '000',
                content  => @(EOF)
                        SHELL=/bin/bash
                        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
+                       | EOF
+       }
+       concat::fragment { 'dsa-check_puppet_agent':
+               target => '/etc/cron.d/puppet-nagios-wraps',
+               order  => '010',
+               content  => @(EOF)
                        47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check_puppet_agent -d0 -c 28800 -w 18000
                        | EOF
        }