X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=a2c2230b6858d6c2251937cb950cfc1cff419481;hb=fbc97990bd45935b7b78996b16fc583a52c15981;hp=7b8927de304a646d6f8b3b23a1c57b0b0deafe8e;hpb=ae040bee3562b2253cf41ac45e3ea59f031ee53f;p=mirror%2Fdsa-puppet.git diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index 7b8927de3..a2c2230b6 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -4,7 +4,8 @@ class nagios::client inherits nagios { ensure => purged } package { 'dsa-nagios-checks': - ensure => installed + ensure => installed, + tag => extra_repo, } service { 'nagios-nrpe-server': @@ -36,22 +37,28 @@ class nagios::client inherits nagios { } file { '/etc/nagios/': ensure => directory, - mode => '0755', + 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',