From 2bd18fcad2e1446388948ed0b98232d93564b8ad Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 24 Apr 2013 18:23:41 +0200
Subject: take out plain couchdb setup, always deploy bigcouch (Feature #2176)

---
 puppet/manifests/site.pp                      | 4 +---
 puppet/modules/site_couchdb/manifests/init.pp | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index f1b02aca..2d41d45f 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -24,9 +24,7 @@ if 'openvpn' in $services {
 }
 
 if 'couchdb' in $services {
-  class {'site_couchdb':
-    bigcouch => true
-  }
+  include site_couchdb
 }
 
 if 'webapp' in $services {
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 5e26b837..9f4824b4 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,4 +1,4 @@
-class site_couchdb ( $bigcouch = false ) {
+class site_couchdb {
   tag 'leap_service'
 
   $x509                   = hiera('x509')
@@ -27,7 +27,7 @@ class site_couchdb ( $bigcouch = false ) {
   $ednp_port              = $bigcouch_config['ednp_port']
 
   class { 'couchdb':
-    bigcouch        => $bigcouch,
+    bigcouch        => true,
     admin_pw        => $couchdb_admin_pw,
     admin_salt      => $couchdb_admin_salt,
     bigcouch_cookie => $bigcouch_cookie,
-- 
cgit v1.2.3