X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=768bed243a05d31581c12c710a261fd7fc9991a8;hb=29cbe59430d1e7d7d5575579b48513c56227e2f7;hp=b31cd60ef35d7a4329b2b025942c0627a2068ef8;hpb=316b1e5472a4d59e0c31069746876ef97c93f698;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index b31cd60ef..768bed243 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -14,12 +14,12 @@ class nagios::client inherits nagios {
 		pattern   => 'nrpe',
 	}
 
-	@ferm::rule { 'dsa-nagios-v4':
+	ferm::rule { 'dsa-nagios-v4':
 		description => 'Allow nrpe from nagios master',
 		rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V4) ACCEPT; }',
 		notarule    => true,
 	}
-	@ferm::rule { 'dsa-nagios-v6':
+	ferm::rule { 'dsa-nagios-v6':
 		description => 'Allow nrpe from nagios master',
 		domain      => 'ip6',
 		rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V6) ACCEPT; }',
@@ -76,13 +76,12 @@ class nagios::client inherits nagios {
 		ensure => absent,
 	}
 
-	concat { '/etc/cron.d/puppet-nagios-wraps': }
-	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)
-			SHELL=/bin/bash
-			PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
-			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
 	}
 }