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
---
 puppet/modules/site_couchdb/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_couchdb/manifests/init.pp')

diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 8d79ae75..0c126f0c 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -41,8 +41,8 @@ class site_couchdb {
   $couchdb_pwhash_alg       = $couchdb_config['pwhash_alg']
 
   if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch }
-  if $couchdb_mode == 'master'      { include site_couchdb::master }
-  if $couchdb_mode == 'mirror'      { include site_couchdb::mirror }
+  if $couchdb_mode == 'plain'       { include site_couchdb::plain }
+  # if $couchdb_mode == 'mirror'      { include site_couchdb::mirror }
 
   Class['site_config::default']
     -> Service['shorewall']
-- 
cgit v1.2.3