summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_nickserver/manifests/init.pp7
1 files changed, 2 insertions, 5 deletions
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']