From a241d230f01ac2c89405f4ef12f5d27bdedf1543 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 28 Nov 2013 11:52:16 -0500 Subject: remove nickserver admin user, and fix nickserver couchdb hiera variables Change-Id: I5bdb6b946becdc95cadc92651c06e66b826e2698 --- puppet/modules/site_nickserver/manifests/init.pp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'puppet') diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index bedef74d..e1b911c1 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -21,11 +21,8 @@ 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'] + $couchdb_user = $nickserver['couchdb_nickserver_user']['username'] + $couchdb_password = $nickserver['couchdb_nickserver_user']['password'] # the port that public connects to (should be 6425) $nickserver_port = $nickserver['port'] -- cgit v1.2.3