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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index bc6b2a6fc..45acf85c1 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -72,5 +72,24 @@ class nagios::client inherits nagios {
 		content => template('nagios/obsolete-packages-ignore.d-hostspecific.erb'),
 		require => Package['dsa-nagios-checks'],
 	}
+	file { '/usr/local/sbin/dsa-check-libs':
+		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',
+		order  => '010',
+		content  => @(EOF)
+			47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check_puppet_agent -d0 -c 28800 -w 18000
+			| EOF
+	}
 }