From da2c743faaccd26604c4c26fbb1557934688eb4a Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 1 Feb 2016 15:56:41 -0800
Subject: default to plain couchdb, unless otherwise specified.

# Conflicts:
#	puppet/modules/site_couchdb/manifests/plain.pp
---
 .../manifests/agent/couchdb/master.pp              | 23 ----------------------
 .../site_check_mk/manifests/agent/couchdb/plain.pp | 23 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp

(limited to 'puppet/modules/site_check_mk/manifests/agent/couchdb')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp
deleted file mode 100644
index 291b87d1..00000000
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb/master.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# configure logwatch and nagios checks for plain single couchdb master
-class site_check_mk::agent::couchdb::master {
-
-  # remove bigcouch leftovers
-  augeas {
-    'Bigcouch_epmd_procs':
-      incl    => '/etc/check_mk/mrpe.cfg',
-      lens    => 'Spacevars.lns',
-      changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs',
-      require => File['/etc/check_mk/mrpe.cfg'];
-    'Bigcouch_beam_procs':
-      incl    => '/etc/check_mk/mrpe.cfg',
-      lens    => 'Spacevars.lns',
-      changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs',
-      require => File['/etc/check_mk/mrpe.cfg'];
-    'Bigcouch_open_files':
-      incl    => '/etc/check_mk/mrpe.cfg',
-      lens    => 'Spacevars.lns',
-      changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files',
-      require => File['/etc/check_mk/mrpe.cfg'];
-  }
-
-}
diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp
new file mode 100644
index 00000000..3ec2267b
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp
@@ -0,0 +1,23 @@
+# configure logwatch and nagios checks for plain single couchdb master
+class site_check_mk::agent::couchdb::plain {
+
+  # remove bigcouch leftovers
+  augeas {
+    'Bigcouch_epmd_procs':
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs',
+      require => File['/etc/check_mk/mrpe.cfg'];
+    'Bigcouch_beam_procs':
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs',
+      require => File['/etc/check_mk/mrpe.cfg'];
+    'Bigcouch_open_files':
+      incl    => '/etc/check_mk/mrpe.cfg',
+      lens    => 'Spacevars.lns',
+      changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files',
+      require => File['/etc/check_mk/mrpe.cfg'];
+  }
+
+}
-- 
cgit v1.2.3