Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[dsa-puppet.git] / modules / nagios / manifests / server.pp

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 0573c14e8f5e54a5d45fa12259d60ab311e4201a..1bbd5769e1d44ffc09322db45b2f2e24576a7f45 100644 (file)
--- 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 => remote,
+               source  => 'puppet:///files/empty/',
                require => Package['nagios3'],
                notify  => Service['nagios3'],
        }
        file { '/etc/nagios3':
                ensure  => directory,
                recurse => remote,
+               source  => 'puppet:///files/empty/',
                require => Package['nagios3'],
                notify  => Service['nagios3'],
        }
        file { '/etc/nagios3/puppetconf.d':
                ensure => directory,
                recurse => remote,
+               source  => 'puppet:///files/empty/',
                require => Package['nagios3'],
                notify  => Service['nagios3'],
        }