summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-07-29 14:23:11 -0400
committerMicah Anderson <micah@leap.se>2013-08-01 12:03:18 +0200
commitab668294faeeb193ccb9c202fa48ed698696f931 (patch)
tree15a6b083a8dda4df8949c8c3495249b87c641364 /puppet/modules/soledad/manifests
parent5ab94dcc7398f566967fd30747447cc6759fd227 (diff)
fix #3291: set the soledad port properly in the json and as a temporary work-around, use the couchdb admin/passwd
Change-Id: Ibb1cd8416d00552f8ca1716e42a08137a4b461aa
Diffstat (limited to 'puppet/modules/soledad/manifests')
-rw-r--r--puppet/modules/soledad/manifests/server.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 06de8642..a75b4b8a 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -2,11 +2,11 @@ class soledad::server {
tag 'leap_service'
include soledad
- $couchdb = hiera('couch')
+ $couchdb = hiera('soledad')
$couchdb_host = 'localhost'
$couchdb_port = '4096'
- $couchdb_user = $couchdb['users']['soledad']['username']
- $couchdb_password = $couchdb['users']['soledad']['password']
+ $couchdb_user = $couchdb['couchdb_admin_user']['username']
+ $couchdb_password = $couchdb['couchdb_admin_user']['password']
$x509 = hiera('x509')
$x509_key = $x509['key']