From 1530a85da3415bc000635d62882d9ba7082a793b Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 16 Apr 2015 20:42:09 -0700 Subject: properly clean up unused files --- .../modules/site_config/manifests/remove_files.pp | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 puppet/modules/site_config/manifests/remove_files.pp (limited to 'puppet/modules/site_config/manifests/remove_files.pp') diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp new file mode 100644 index 00000000..cc5fc174 --- /dev/null +++ b/puppet/modules/site_config/manifests/remove_files.pp @@ -0,0 +1,36 @@ +# +# Sometimes when we upgrade the platform, we need to ensure that files that +# the platform previously created will get removed. +# +# These file removals don't need to be kept forever: we only need to remove +# files that are present in the prior platform release. +# +# We can assume that the every node is upgraded from the previous platform +# release. +# + +class site_config::remove_files { + + # + # Platform 0.7 removals + # + + tidy { + '/etc/rsyslog.d/99-tapicero.conf':; + '/etc/rsyslog.d/99-leap-mx.conf':; + '/etc/rsyslog.d/01-webapp.conf':; + '/etc/rsyslog.d/50-stunnel.conf':; + '/etc/logrotate.d/leap-mx':; + '/etc/logrotate.d/stunnel':; + '/var/log/stunnel4/stunnel.log':; + 'leap_mx': + path => '/var/log/', + recurse => true, + matches => 'leap_mx*'; + '/srv/leap/webapp/public/provider.json':; + '/srv/leap/couchdb/designs/tmp_users': + recurse => true, + rmdirs => true; + } + +} -- cgit v1.2.3 From 64cc83793aa35b84b60dd40305c7edf8369a187b Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 17 Apr 2015 10:19:37 -0700 Subject: rename leap-mx logrotate file; minor style change. --- puppet/modules/site_config/manifests/remove_files.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_config/manifests/remove_files.pp') diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp index cc5fc174..44e3e47b 100644 --- a/puppet/modules/site_config/manifests/remove_files.pp +++ b/puppet/modules/site_config/manifests/remove_files.pp @@ -20,7 +20,7 @@ class site_config::remove_files { '/etc/rsyslog.d/99-leap-mx.conf':; '/etc/rsyslog.d/01-webapp.conf':; '/etc/rsyslog.d/50-stunnel.conf':; - '/etc/logrotate.d/leap-mx':; + '/etc/logrotate.d/mx':; '/etc/logrotate.d/stunnel':; '/var/log/stunnel4/stunnel.log':; 'leap_mx': -- cgit v1.2.3 From 984684f56f15d9d89ea78ffe6ed67dabf3d63208 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 13 May 2015 13:38:28 +0200 Subject: remove old leap_mx logfile location from check_mk logwatch state file #6964 Change-Id: I385c639e5c096deef4f81691a85c1b83cbab9421 --- puppet/modules/site_config/manifests/remove_files.pp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'puppet/modules/site_config/manifests/remove_files.pp') diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp index 44e3e47b..05a758bb 100644 --- a/puppet/modules/site_config/manifests/remove_files.pp +++ b/puppet/modules/site_config/manifests/remove_files.pp @@ -33,4 +33,11 @@ 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.*')]" ], + } + } -- cgit v1.2.3 From d5dccfc5cd72188bac66d7433c94b1046b50c7fb Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 26 May 2015 11:47:26 +0200 Subject: 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 --- puppet/modules/site_config/manifests/remove_files.pp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'puppet/modules/site_config/manifests/remove_files.pp') 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.*')]" ], - } - } -- cgit v1.2.3 From 26f7665f556570e4bbd446d7b2046854642aff58 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 26 May 2015 12:22:29 +0200 Subject: check_mk complains about non-existing logfile (#6964) Change-Id: Ic58f9516854f812d46aa3a574628318951f99a95 --- puppet/modules/site_config/manifests/remove_files.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'puppet/modules/site_config/manifests/remove_files.pp') 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" + } + + } -- cgit v1.2.3