summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-28 10:31:49 -0500
committerMicah Anderson <micah@leap.se>2013-11-28 10:31:49 -0500
commitbba78a580f7c859d3d0d726e291ad628d7e835d3 (patch)
treeafaa3719f2f4fcf3ae93aea3182fa93d2ff792e5
parentc42879b031a8363e0ad575550c0fd36b269e9e28 (diff)
remove admin access from nickserver
Change-Id: If7fff4c2b839cef5807ee8cee1355aea4dc719a8
-rw-r--r--provider_base/services/webapp.json3
-rw-r--r--puppet/modules/site_nickserver/manifests/init.pp10
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