X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=8991f57fe1496ef5c0458b578bf9015898c91b5e;hb=199493bc8beb1c63e2459c742cfa891865a1e38f;hp=45acf85c1259527bfbf1e6b72e7111e6949fa0a2;hpb=ada2a1dd5c06f69eb3ba3e69ffa21a1a550ec403;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 45acf85c1..8991f57fe 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -76,20 +76,12 @@ 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
+			47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check-puppet_agent -d0 -c 28800 -w 18000
 			| EOF
 	}
 }