Merge branch '6964_use_exec_to_remove_matching_fileline' into 0.7.0

4 files changed, 7 insertions, 27 deletions

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 75f545d4..c32c29c4 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,4 +1,3 @@
-# setup basic debian package manager configuration
 class site_apt {
 
   $sources           = hiera('sources')
@@ -32,8 +31,6 @@ class site_apt {
     priority => 999
   }
 
-  include site_apt::preferences::augeas
-
   # All packages should be installed _after_ refresh_apt is called,
   # which does an apt-get update.
   # There is one exception:
diff --git a/puppet/modules/site_apt/manifests/preferences/augeas.pp b/puppet/modules/site_apt/manifests/preferences/augeas.pp
deleted file mode 100644
index 257d64c4..00000000
--- a/puppet/modules/site_apt/manifests/preferences/augeas.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# install augeas packages from backports
-class site_apt::preferences::augeas {
-
-  # i could not get
-  # site_config::remove_files::augeas::['rm_old_leap_mx_log_destination']
-  # to remove a line matching a regex with the wheezy version of augeas-lenses
-  # (0.10.0-1). Therefore we install it from backports
-
-  apt::preferences_snippet { 'augeas':
-    package  => 'augeas-lenses augeas-tools libaugeas0',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999;
-  }
-
-}
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..3f46659c 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -34,10 +34,13 @@ class site_config::remove_files {
   }
 
   # 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.*')]" ],
+  # 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"
   }
 
+
 }