X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=dcefea58dc5b2a062edc2e580ff57dab34277ec9;hb=168aa3f05f914802698b8db5fdde823c4e992913;hp=94bbf93c6994615af7e0cf52954cc16edea046d9;hpb=05bfa391748bf827189c42c1a79694ca4cef28c3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 94bbf93c6..dcefea58d 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; }',
@@ -77,11 +77,11 @@ class nagios::client inherits nagios {
 	}
 
 	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',
+	concat::fragment { 'puppet-crontab--nagios--dsa-check-puppet-agent':
+		target => '/etc/cron.d/puppet-crontab',
 		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
 	}
 }