summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-05-28 11:39:47 +0200
committervarac <varacanero@zeromail.org>2015-05-28 11:39:47 +0200
commitf868a99e76b58243a0fd6321841cca4ad3091dba (patch)
tree11f5a72fc89f7b28167ff1def50ce47dc68ecc92 /puppet/modules/site_config
parentb614675485bf01b222acff1299b47cc2242c5f6f (diff)
parent9f518a1e0f8c45f99d63cf4485457b7292d26295 (diff)
Merge branch '0.7.0' into develop
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/remove_files.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index 44e3e47b..3f46659c 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -33,4 +33,14 @@ class site_config::remove_files {
rmdirs => true;
}
+ # leax-mx logged to /var/log/leap_mx.log in the past
+ # we need to use a dumb exec here because file_line doesn't
+ # allow removing lines that match a regex in the current version
+ # of stdlib, see https://tickets.puppetlabs.com/browse/MODULES-1903
+ exec { 'rm_old_leap_mx_log_destination':
+ command => "/bin/sed -i '/leap_mx.log/d' /etc/check_mk/logwatch.state",
+ onlyif => "/bin/grep -qe 'leap_mx.log' /etc/check_mk/logwatch.state"
+ }
+
+
}