X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=45acf85c1259527bfbf1e6b72e7111e6949fa0a2;hb=bd35714fff1db0ae3901ea95e82a8f603130bcae;hp=5dfd1029f91e77f7f0b36c93e3655059443b4e89;hpb=6f20bca6cbb82c792be697e6ae1e47fcded1ccaf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 5dfd1029f..45acf85c1 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -73,11 +73,23 @@ class nagios::client inherits nagios {
 		require => Package['dsa-nagios-checks'],
 	}
 	file { '/usr/local/sbin/dsa-check-libs':
-		source  => 'puppet:///modules/nagios/dsa-check-libs',
-		mode    => '0555',
+		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",
+	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',
+		order  => '010',
+		content  => @(EOF)
+			47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check_puppet_agent -d0 -c 28800 -w 18000
+			| EOF
 	}
 }