X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;fp=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=d792968d0eb9ee976ea17c6255006062f5b4be3e;hb=978b3d3a80635c75775d7ae42485a8e14478eda3;hp=a2a7c24d81554946da7208d774e4f88566da7b68;hpb=3da3099c18259b8a9a13fdaa3653cf7e88ae09fc;p=mirror%2Fdsa-puppet.git diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp index a2a7c24d8..d792968d0 100644 --- a/modules/nagios/manifests/client.pp +++ b/modules/nagios/manifests/client.pp @@ -41,10 +41,19 @@ class nagios::client inherits nagios { source => 'puppet:///files/empty/', notify => Service['nagios-nrpe-server'], } - file { '/etc/nagios/nrpe.d/debianorg.cfg': + + concat { '/etc/nagios/nrpe.d/debianorg.cfg': + ensure_newline => true, + warn => '# This file is maintained with puppet', + notify => Service['nagios-nrpe-server'], + mode => '0444', + } + concat { 'nrpe-debian-staticchecks': + target => '/etc/nagios/nrpe.d/debianorg.cfg', content => template('nagios/inc-debian.org.erb'), - notify => Service['nagios-nrpe-server'], } + Concat::Fragment <<| tag == 'nagios-nrpe::server::debianorg.cfg' |>> + file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg': source => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg', notify => Service['nagios-nrpe-server'],