From bba78a580f7c859d3d0d726e291ad628d7e835d3 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 10:31:49 -0500
Subject: remove admin access from nickserver

Change-Id: If7fff4c2b839cef5807ee8cee1355aea4dc719a8
---
 puppet/modules/site_nickserver/manifests/init.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_nickserver')

diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp
index 81482a55..bedef74d 100644
--- a/puppet/modules/site_nickserver/manifests/init.pp
+++ b/puppet/modules/site_nickserver/manifests/init.pp
@@ -20,14 +20,18 @@ class site_nickserver {
   #
 
   $nickserver        = hiera('nickserver')
+  $nickserver_domain = $nickserver['domain']
+
+  $couchdb           = hiera('couch')
+  $couchdb_users     = $couchdb['users']
+  $couchdb_user      = $couchdb_users['nickserver']['username']
+  $couchdb_password  = $couchdb_users['nickserver']['password']
+
   # the port that public connects to (should be 6425)
   $nickserver_port   = $nickserver['port']
   # the port that nickserver is actually running on
   $nickserver_local_port = '64250'
-  $nickserver_domain = $nickserver['domain']
 
-  $couchdb_user      = $nickserver['couchdb_user']['username']
-  $couchdb_password  = $nickserver['couchdb_user']['password']
   # couchdb is available on localhost via haproxy, which is bound to 4096.
   $couchdb_host      = 'localhost'
   # See site_webapp/templates/haproxy_couchdb.cfg.erg
-- 
cgit v1.2.3