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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 9ea7b3393..94bbf93c6 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -5,10 +5,7 @@ class nagios::client inherits nagios {
 	}
 	package { 'dsa-nagios-checks':
 		ensure => installed,
-		require => [
-			File['/etc/apt/sources.list.d/db.debian.org.list'],
-			Exec['apt-get update']
-		]
+		tag    => extra_repo,
 	}
 
 	service { 'nagios-nrpe-server':
@@ -67,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
+	}
 }