summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/soledad/manifests/server.pp18
1 files changed, 10 insertions, 8 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 6ccd934a..339030fc 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -3,19 +3,21 @@ class soledad::server {
include soledad
include site_apt::preferences::twisted
- $couchdb = hiera('soledad')
- $couchdb_host = 'localhost'
- $couchdb_port = '5984'
- $couchdb_user = $couchdb['couchdb_admin_user']['username']
- $couchdb_password = $couchdb['couchdb_admin_user']['password']
+ $couchdb = hiera('couch')
+ $couchdb_users = $couchdb['users']
+ $couchdb_user = $couchdb_users['soledad']['username']
+ $couchdb_password = $couchdb_users['soledad']['password']
- include site_config::x509::cert
- include site_config::x509::key
- include site_config::x509::ca
+ $couchdb_host = 'localhost'
+ $couchdb_port = '5984'
$soledad = hiera('soledad')
$soledad_port = $soledad['port']
+ include site_config::x509::cert
+ include site_config::x509::key
+ include site_config::x509::ca
+
#
# SOLEDAD CONFIG
#