diff options
author | varac <varacanero@zeromail.org> | 2014-03-04 18:59:47 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-03-04 18:59:47 +0100 |
commit | dfe2800b2264b4f2088d488d718ce72e39d2d15f (patch) | |
tree | 4792721b97f95e45eb8a7041901a157b8fe473da /puppet/modules/site_nagios/manifests/server/purge.pp | |
parent | 468064d2346519eeda7638a185ff5fa6b53d5eb4 (diff) | |
parent | 3b7c8e273a0e75e58c736b2eacf89b4c7b9d81e5 (diff) |
Merge branch 'improve_monitoring_even_more' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server/purge.pp')
-rw-r--r-- | puppet/modules/site_nagios/manifests/server/purge.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp index 1c12cfb0..6815a703 100644 --- a/puppet/modules/site_nagios/manifests/server/purge.pp +++ b/puppet/modules/site_nagios/manifests/server/purge.pp @@ -10,9 +10,10 @@ class site_nagios::server::purge inherits nagios::base { purge => false } - # only purge find in the /etc/nagios3/conf.d/ dir, not in any subdir + # only purge files in the /etc/nagios3/conf.d/ dir, not in any subdir exec {'purge_conf.d': command => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f -exec rm {} \;', - onlyif => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f | grep -q "/etc/nagios3/conf.d"' + onlyif => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f | grep -q "/etc/nagios3/conf.d"', + require => Package['nagios'] } } |