From ab668294faeeb193ccb9c202fa48ed698696f931 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Mon, 29 Jul 2013 14:23:11 -0400
Subject: fix #3291: set the soledad port properly in the json and as a
 temporary work-around, use the couchdb admin/passwd

Change-Id: Ibb1cd8416d00552f8ca1716e42a08137a4b461aa
---
 provider_base/services/soledad.json        | 7 ++++---
 puppet/modules/soledad/manifests/server.pp | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json
index de24d8ef..b6a0721c 100644
--- a/provider_base/services/soledad.json
+++ b/provider_base/services/soledad.json
@@ -1,6 +1,7 @@
 {
-  "service_type": "public_service",
   "soledad": {
-    "port": 1111
-  }
+    "port": 2424,
+    "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]"
+  },
+  "service_type": "public_service"
 }
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']
-- 
cgit v1.2.3