summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-01-26 12:27:51 -0800
committerelijah <elijah@riseup.net>2016-01-26 12:27:51 -0800
commitb95d60260ecb57fe08fca0571771a14b803c1b4e (patch)
tree30f0bbb5156ec13951e1ed32c06bdc7550c6d044 /puppet/modules/site_config
parent8fc9f0da2f755ad8b225d4b0557c6179236ca7f4 (diff)
parent27a059ccb3b5210f7e539326c30f20d8530cde1d (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/remove/bigcouch.pp26
-rw-r--r--puppet/modules/site_config/manifests/remove/files.pp18
2 files changed, 26 insertions, 18 deletions
diff --git a/puppet/modules/site_config/manifests/remove/bigcouch.pp b/puppet/modules/site_config/manifests/remove/bigcouch.pp
new file mode 100644
index 00000000..0783fe9d
--- /dev/null
+++ b/puppet/modules/site_config/manifests/remove/bigcouch.pp
@@ -0,0 +1,26 @@
+# remove bigcouch leftovers from previous installations
+class site_config::remove::bigcouch {
+
+ # Don't use check_mk logwatch to watch bigcouch logs anymore
+ # see https://leap.se/code/issues/7375 for more details
+ file { '/etc/check_mk/logwatch.d/bigcouch.cfg':
+ ensure => absent,
+ notify => [
+ Exec['remove_bigcouch_logwatch_spoolfiles'],
+ Exec['remove_bigcouch_logwatch_stateline']
+ ]
+ }
+ # 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,
+ }
+ exec { 'remove_bigcouch_logwatch_stateline':
+ command => "sed -i '/bigcouch.log/d' /etc/check_mk/logwatch.state",
+ refreshonly => true,
+ }
+
+ cron { 'compact_all_shards':
+ ensure => absent
+ }
+}
diff --git a/puppet/modules/site_config/manifests/remove/files.pp b/puppet/modules/site_config/manifests/remove/files.pp
index 077381e1..4f7aa6e6 100644
--- a/puppet/modules/site_config/manifests/remove/files.pp
+++ b/puppet/modules/site_config/manifests/remove/files.pp
@@ -51,22 +51,4 @@ class site_config::remove::files {
onlyif => "/bin/grep -qe 'leap_mx.log' /etc/check_mk/logwatch.state"
}
- # Don't use check_mk logwatch to watch bigcouch logs anymore
- # see https://leap.se/code/issues/7375 for more details
- file { '/etc/check_mk/logwatch.d/bigcouch.cfg':
- ensure => absent,
- notify => [
- Exec['remove_bigcouch_logwatch_spoolfiles'],
- Exec['remove_bigcouch_logwatch_stateline']
- ]
- }
- # 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,
- }
- exec { 'remove_bigcouch_logwatch_stateline':
- command => "sed -i '/bigcouch.log/d' /etc/check_mk/logwatch.state",
- refreshonly => true,
- }
}