clean up aptrepo ordering

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

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index a248229..7c5d6ca 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -4,7 +4,7 @@ class nagios::client inherits nagios {
                ensure => purged
        }
        package { 'dsa-nagios-checks':
-               ensure => installed
+               ensure => installed,
        }
 
        service { 'nagios-nrpe-server':
@@ -36,21 +36,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',