X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=768bed243a05d31581c12c710a261fd7fc9991a8;hb=f7adabc11f4b86313d541b2007570cf3e475320b;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..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; }',
@@ -73,11 +73,15 @@ 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",
+	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
+			| EOF
 	}
 }