X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fserver.pp;h=1bbd5769e1d44ffc09322db45b2f2e24576a7f45;hb=74ed2c40f0f4ca856c7d9e01271a0edd74c77f2a;hp=21e00b07d395fdeffcfc024e3912967aa33ad41f;hpb=7a6e0fd9840f072852557a25b1560ab4c17111d6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 21e00b07d..1bbd5769e 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -9,25 +9,36 @@ class nagios::server {
 		ensure => installed
 	}
 
+	file { '/etc/init.d/nagios3':
+		source  => 'puppet:///modules/nagios/nagios3.init',
+		mode    => '0755',
+		require => Package['nagios3'],
+		before  => Service['nagios3'],
+	}
+
 	service { 'nagios3':
-		ensure => running,
+		ensure  => running,
+		require => Package['nagios3'],
 	}
 
 	file { '/etc/nagios-plugins/config':
 		ensure  => directory,
-		recurse => true,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
 		require => Package['nagios3'],
 		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3':
 		ensure  => directory,
-		recurse => true,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
 		require => Package['nagios3'],
 		notify  => Service['nagios3'],
 	}
 	file { '/etc/nagios3/puppetconf.d':
 		ensure => directory,
-		recurse => true,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
 		require => Package['nagios3'],
 		notify  => Service['nagios3'],
 	}