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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index e4f8d90ea..94bbf93c6 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':
@@ -36,7 +37,8 @@ class nagios::client inherits nagios {
 	}
 	file { '/etc/nagios/':
 		ensure  => directory,
-		recurse => true,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
 		require => Package['nagios-nrpe-server'],
 		notify  => Service['nagios-nrpe-server'],
 	}
@@ -46,7 +48,8 @@ class nagios::client inherits nagios {
 	}
 	file { '/etc/nagios/nrpe.d':
 		ensure  => directory,
-		recurse => true,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
 		notify  => Service['nagios-nrpe-server'],
 	}
 	file { '/etc/nagios/nrpe.d/debianorg.cfg':
@@ -61,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
+	}
 }