From 80ae781667ab1d8803593e03fc9c928b86db5e97 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 31 Jul 2013 17:40:26 +0200
Subject: fix /etc/leap/mx.conf doesn't contain any user credentials (Feature
 #3347)

---
 provider_base/services/mx.json           | 1 +
 puppet/modules/leap_mx/manifests/init.pp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index 91ad3277..d633d1dc 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -8,6 +8,7 @@
   "haproxy": {
     "local_ports": "= stunnel.couch_client.field(:accept_port)"
   },
+  "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
   "x509": {
     "use": true,
     "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 23fd1054..1e186bbb 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -1,9 +1,10 @@
 class leap_mx {
 
+  $couchdb_admin_user = hiera('couchdb_admin_user')
   $couchdb_host     = 'localhost'
   $couchdb_port     = '4096'
-  $couchdb_user     = $soledad::couchdb::user
-  $couchdb_password = $soledad::couchdb::password
+  $couchdb_user     = $couchdb_admin_user['username']
+  $couchdb_password = $couchdb_admin_user['password']
 
   #
   # USER AND GROUP
-- 
cgit v1.2.3