summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-07-31 17:40:26 +0200
committervarac <varacanero@zeromail.org>2013-07-31 17:44:34 +0200
commit80ae781667ab1d8803593e03fc9c928b86db5e97 (patch)
tree94748c31144ae9eec34cbfb33d1d3ea21b48fd47 /puppet/modules
parent04502b614692145141c606f9ed052da4b1e4572a (diff)
fix /etc/leap/mx.conf doesn't contain any user credentials (Feature #3347)
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp5
1 files changed, 3 insertions, 2 deletions
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