summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-05-26 11:47:26 +0200
committervarac <varacanero@zeromail.org>2015-05-26 11:47:26 +0200
commitd5dccfc5cd72188bac66d7433c94b1046b50c7fb (patch)
tree92312a608bf941d5da5bd098d5caa558e934d3fb /puppet/modules/site_config/manifests
parente722c9a2ab06afa0d97914fc033701b65dc8fe24 (diff)
Revert "remove old leap_mx logfile location from check_mk logwatch state file #6964"
This reverts commit 984684f56f15d9d89ea78ffe6ed67dabf3d63208. Needed because: Augeas fails after upgrading augeas packages during same puppetrun, but only on first deploy - https://leap.se/code/issues/6997
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
-rw-r--r--puppet/modules/site_config/manifests/remove_files.pp7
2 files changed, 0 insertions, 12 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 57e45506..e69e4b7b 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,4 +1,3 @@
-# This class is the basic configuration for all nodes
class site_config::default {
tag 'leap_base'
@@ -14,10 +13,6 @@ class site_config::default {
include apt::update
Package { require => Exec['apt_updated'] }
- class {'augeas':
- version => 'latest'
- }
-
include site_config::slow
# default class, used by all hosts
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index 05a758bb..44e3e47b 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -33,11 +33,4 @@ class site_config::remove_files {
rmdirs => true;
}
- # leax-mx logged to /var/log/leap_mx.log in the past
- augeas { 'rm_old_leap_mx_log_destination':
- incl => '/etc/check_mk/logwatch.state',
- lens => 'Simplelines.lns',
- changes => [ "rm /files/etc/check_mk/logwatch.state/*[.=~regexp('.*leap_mx.log.*')]" ],
- }
-
}