From ea2955c73150dc7417b2637acb2b29a955550c29 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 1 Feb 2016 20:51:04 +0100
Subject: [bug] Fix bigcouch spoolfile removal

- Resolves: #7641
---
 puppet/modules/site_config/manifests/remove/bigcouch.pp   |  1 -
 puppet/modules/site_config/manifests/remove/monitoring.pp | 12 ++++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_config/manifests/remove/bigcouch.pp b/puppet/modules/site_config/manifests/remove/bigcouch.pp
index f8e0ebe2..26ba8d09 100644
--- a/puppet/modules/site_config/manifests/remove/bigcouch.pp
+++ b/puppet/modules/site_config/manifests/remove/bigcouch.pp
@@ -6,7 +6,6 @@ class site_config::remove::bigcouch {
   file { '/etc/check_mk/logwatch.d/bigcouch.cfg':
     ensure => absent,
     notify => [
-      Exec['remove_bigcouch_logwatch_spoolfiles'],
       Exec['remove_bigcouch_logwatch_stateline']
     ]
   }
diff --git a/puppet/modules/site_config/manifests/remove/monitoring.pp b/puppet/modules/site_config/manifests/remove/monitoring.pp
index ab9f7a8f..18e2949b 100644
--- a/puppet/modules/site_config/manifests/remove/monitoring.pp
+++ b/puppet/modules/site_config/manifests/remove/monitoring.pp
@@ -1,17 +1,13 @@
 # remove leftovers on monitoring nodes
 class site_config::remove::monitoring {
 
+  # Remove check_mk loggwatch spoolfiles for
+  # tapicero and bigcouch
   tidy {
-    'checkmk_logwatch_spool':
+    'remove_logwatch_spoolfiles':
       path    => '/var/lib/check_mk/logwatch',
       recurse => true,
-      matches => '*tapicero.log'
-  }
-
-  # remove leftover bigcouch logwatch spool files
-  exec { 'remove_bigcouch_logwatch_spoolfiles':
-    command     => 'find /var/lib/check_mk/logwatch -name \'\\opt\\bigcouch\\var\\log\\bigcouch.log\' -exec rm {} \;',
-    refreshonly => true,
+      matches => [ '*tapicero.log', '*bigcouch.log'];
   }
 
 }
-- 
cgit v1.2.3