merge nagios-wraps crontab into dsa-puppet-stuff

[mirror/dsa-puppet.git] / modules / nagios / manifests / client.pp

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 8f2249d..94bbf93 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -76,7 +76,12 @@ class nagios::client inherits nagios {
                ensure => absent,
        }
 
-       file { '/etc/cron.d/puppet-nagios-wraps':
-               content  => "47 * * * * root /usr/sbin/dsa-wrap-nagios-check -s puppet-agent /usr/lib/nagios/plugins/dsa-check_puppet_agent -d0 -c 28800 -w 18000\n",
+       file { '/etc/cron.d/puppet-nagios-wraps': ensure => absent, }
+       concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-puppet-agent':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               order  => '010',
+               content  => @(EOF)
+                       47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check_puppet_agent -d0 -c 28800 -w 18000
+                       | EOF
        }
 }