X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=9ea7b33938f537f876a80ee0be8be9504eb643d5;hb=5de44aea7fee151ad1dcde987c1374585a7f9698;hp=b72f002b1774953cae344719f6618e2fe0d84338;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index b72f002b1..9ea7b3393 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':
@@ -15,13 +19,13 @@ class nagios::client inherits nagios {
 
 	@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; }',
+		rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V4) ACCEPT; }',
 		notarule    => true,
 	}
 	@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; }',
+		rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V6) ACCEPT; }',
 		notarule    => true,
 	}
 
@@ -36,21 +40,28 @@ class nagios::client inherits nagios {
 	}
 	file { '/etc/nagios/':
 		ensure  => directory,
+		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',