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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 0e844743f..768bed243 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -4,7 +4,8 @@ class nagios::client inherits nagios {
 		ensure => purged
 	}
 	package { 'dsa-nagios-checks':
-		ensure => installed
+		ensure => installed,
+		tag    => extra_repo,
 	}
 
 	service { 'nagios-nrpe-server':
@@ -13,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; }',
@@ -63,9 +64,24 @@ class nagios::client inherits nagios {
 		source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',
 		require => Package['dsa-nagios-checks'],
 	}
+	file { '/etc/nagios/check-libs.conf':
+		source  => 'puppet:///modules/nagios/common/check-libs.conf',
+		require => Package['dsa-nagios-checks'],
+	}
 	file { '/etc/nagios/obsolete-packages-ignore.d/hostspecific':
 		content => template('nagios/obsolete-packages-ignore.d-hostspecific.erb'),
 		require => Package['dsa-nagios-checks'],
 	}
+	file { '/usr/local/sbin/dsa-check-libs':
+		ensure => absent,
+	}
 
+	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
+	}
 }