summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/remove/bigcouch.pp22
-rw-r--r--puppet/modules/site_config/manifests/remove/files.pp18
-rw-r--r--puppet/modules/site_couchdb/manifests/master.pp4
3 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..19d18eb0
--- /dev/null
+++ b/puppet/modules/site_config/manifests/remove/bigcouch.pp
@@ -0,0 +1,22 @@
+# 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,
+ }
+}
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,
- }
}
diff --git a/puppet/modules/site_couchdb/manifests/master.pp b/puppet/modules/site_couchdb/manifests/master.pp
index 5dab6325..49d90f2f 100644
--- a/puppet/modules/site_couchdb/manifests/master.pp
+++ b/puppet/modules/site_couchdb/manifests/master.pp
@@ -8,4 +8,8 @@ class site_couchdb::master {
}
include site_check_mk::agent::couchdb::master
+
+ # remove bigcouch leftovers from previous installations
+ include ::site_config::remove::bigcouch
+
}