X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fserver.pp;h=e6b87d0e6e1bd4b45ac44e5317e2a1d808e44dca;hb=fd7b914c5519a90f8f7c62c7c93f19ebdaec346e;hp=302a4dbb6465735ec937c09182563ba19128b87d;hpb=bdb83707fab4ff3f1ff01122e9eea038e4f73a0a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 302a4dbb6..e6b87d0e6 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -15,76 +15,65 @@ class nagios::server {
 
 	file { '/etc/nagios-plugins/config':
 		ensure  => directory,
+		recurse => true,
 		require => Package['nagios3'],
 		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3':
 		ensure  => directory,
+		recurse => true,
 		require => Package['nagios3'],
 		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d':
 		ensure => directory,
-		mode   => '0755',
+		recurse => true,
+		require => Package['nagios3'],
+		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios-plugins/config/local-dsa-checkcommands.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/cgi.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/cgi.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/nagios.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/nagios.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/contacts.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/generic-host.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/generic-service.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/timeperiods.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-dependencies.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-hostgroups.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-hosts.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-servicegroups.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg',
-		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d/auto-services.cfg':
 		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg',
-		notify  => Service['nagios3'],
 	}
 }