X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=9ea7b33938f537f876a80ee0be8be9504eb643d5;hb=462359acbb50393c48ff0c4ffd7b3a210b866636;hp=7b8927de304a646d6f8b3b23a1c57b0b0deafe8e;hpb=ae040bee3562b2253cf41ac45e3ea59f031ee53f;p=dsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 7b8927de..9ea7b339 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -4,7 +4,11 @@ class nagios::client inherits nagios {
 		ensure => purged
 	}
 	package { 'dsa-nagios-checks':
-		ensure => installed
+		ensure => installed,
+		require => [
+			File['/etc/apt/sources.list.d/db.debian.org.list'],
+			Exec['apt-get update']
+		]
 	}
 
 	service { 'nagios-nrpe-server':
@@ -36,22 +40,28 @@ class nagios::client inherits nagios {
 	}
 	file { '/etc/nagios/':
 		ensure  => directory,
-		mode    => '0755',
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
 		require => Package['nagios-nrpe-server'],
 		notify  => Service['nagios-nrpe-server'],
 	}
 	file { '/etc/nagios/nrpe.cfg':
 		content => template('nagios/nrpe.cfg.erb'),
+		notify  => Service['nagios-nrpe-server'],
 	}
 	file { '/etc/nagios/nrpe.d':
 		ensure  => directory,
-		mode    => '0755',
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
+		notify  => Service['nagios-nrpe-server'],
 	}
 	file { '/etc/nagios/nrpe.d/debianorg.cfg':
 		content => template('nagios/inc-debian.org.erb'),
+		notify  => Service['nagios-nrpe-server'],
 	}
 	file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg':
 		source  => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg',
+		notify  => Service['nagios-nrpe-server'],
 	}
 	file { '/etc/nagios/obsolete-packages-ignore':
 		source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',