diff options
| author | Micah Anderson <micah@leap.se> | 2013-11-28 11:52:16 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-11-28 12:14:52 -0500 |
| commit | a241d230f01ac2c89405f4ef12f5d27bdedf1543 (patch) | |
| tree | d455bdb16cddcaa07b05a82a1ed4b798c4025964 | |
| parent | 0ee2115516eb8b79ad6ff8711b860d9da60e0f2a (diff) | |
remove nickserver admin user, and fix nickserver couchdb hiera variables
Change-Id: I5bdb6b946becdc95cadc92651c06e66b826e2698
| -rw-r--r-- | provider_base/services/webapp.json | 2 | ||||
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index ba140baf..ca7e7309 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -2,7 +2,6 @@ "webapp": { "admins": [], "modules": ["user", "billing", "help"], - "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]", "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]", "customization_dir": "= file_path 'webapp'", "client_certificates": "= global.provider.ca.client_certificates", @@ -36,6 +35,7 @@ }, "nickserver": { "domain": "= 'nicknym.' + domain.full_suffix", + "couchdb_nickserver_user": "= global.services[:couchdb].couch.users[:nickserver]", "port": 6425 }, "dns": { 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'] |