From 82f0c979bb91912518db3111b714f61cbe21e7df Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 10:02:26 -0500
Subject: remove admin access from soledad

Change-Id: I7c516c6a4ba26d2c5cebe19a9bff66eae3bd430f
---
 provider_base/services/soledad.json        |  1 -
 puppet/modules/soledad/manifests/server.pp | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json
index 6b41c128..dc12454b 100644
--- a/provider_base/services/soledad.json
+++ b/provider_base/services/soledad.json
@@ -1,7 +1,6 @@
 {
   "soledad": {
     "port": 2323,
-    "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
     "require_couchdb": "=> assert %(services.include? 'couchdb')"
   },
   "service_type": "public_service"
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
   #
-- 
cgit v1.2.3