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 45acf85..94bbf93 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -76,17 +76,9 @@ class nagios::client inherits nagios {
                ensure => absent,
        }
 
-       concat { '/etc/cron.d/puppet-nagios-wraps': }
-       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',
+       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