summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-05-10 20:29:17 +0200
committervarac <varacanero@zeromail.org>2017-05-10 21:38:25 +0200
commit746601becc47fcee9fc85700f175a5b33b310979 (patch)
tree09c7c9b48fba890c0a2373a58e521d92025c9668
parent82a9d9cd3b11b5278a1e06c61c0e0b548f533593 (diff)
Nickserver direct access to couchdb on same node
Depending whether couchdb is running on the same node as nickserver, couchdb is available on localhost: - When couchdb is running on a different node: Via stunnel, which is bound to 4000. - When couchdb is running on the same node: On port 5984 Resolves: #8793
-rw-r--r--provider_base/services/webapp.json1
-rw-r--r--puppet/modules/site_nickserver/manifests/init.pp6
2 files changed, 5 insertions, 2 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ede3bf66..36f161b1 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -63,6 +63,7 @@
},
"nickserver": {
"domain": "= 'nicknym.' + domain.full_suffix",
+ "couchdb_port": "= couchdb_port",
"couchdb_nickserver_user": {
"username": "= global.services[:couchdb].couch.users[:nickserver].username",
"password": "= secret :couch_nickserver_password",
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp
index cab13522..48f7b73d 100644
--- a/puppet/modules/site_nickserver/manifests/init.pp
+++ b/puppet/modules/site_nickserver/manifests/init.pp
@@ -28,9 +28,11 @@ class site_nickserver {
# the port that nickserver is actually running on
$nickserver_local_port = '64250'
- # couchdb is available on localhost via stunnel, which is bound to 4000.
+ # couchdb is available on localhost:
+ # - When couchdb is running on a different node: Via stunnel, which is bound to 4000.
+ # - When couchdb is running on the same node: On port 5984
$couchdb_host = 'localhost'
- $couchdb_port = '4000'
+ $couchdb_port = $nickserver['couchdb_port']
$sources = hiera('sources')