diff options
| -rw-r--r-- | provider_base/services/webapp.json | 3 | ||||
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 392375ff..ba140baf 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -36,8 +36,7 @@ }, "nickserver": { "domain": "= 'nicknym.' + domain.full_suffix", - "port": 6425, - "couchdb_user": "= global.services[:couchdb].couch.users[:admin]" + "port": 6425 }, "dns": { "aliases": "= [domain.full_suffix, domain.full, api.domain, nickserver.domain]" 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 |