summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nickserver/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-28 11:52:16 -0500
committerMicah Anderson <micah@leap.se>2013-11-28 12:14:52 -0500
commita241d230f01ac2c89405f4ef12f5d27bdedf1543 (patch)
treed455bdb16cddcaa07b05a82a1ed4b798c4025964 /puppet/modules/site_nickserver/manifests
parent0ee2115516eb8b79ad6ff8711b860d9da60e0f2a (diff)
remove nickserver admin user, and fix nickserver couchdb hiera variables
Change-Id: I5bdb6b946becdc95cadc92651c06e66b826e2698
Diffstat (limited to 'puppet/modules/site_nickserver/manifests')
-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']