diff options
| author | varac <varacanero@zeromail.org> | 2017-02-23 11:42:47 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-03-15 19:22:50 +0100 |
| commit | cce9af1fce42c29bf062cccfc46ef356d83a6328 (patch) | |
| tree | b7f6a7de0f11e9381eb833a09f1cc1175dbce9ca /puppet/modules/site_nickserver/manifests | |
| parent | bb4dd153bbf1174a95017d0046ea9e1320fd81a9 (diff) | |
[8144] Remove Haproxy
We used haproxy because we had multiple bigcouch nodes but now
with a single couchdb node this is not needed anymore.
- Resolves: #8144
Diffstat (limited to 'puppet/modules/site_nickserver/manifests')
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index 8ef47b07..cab13522 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -1,9 +1,8 @@ # -# TODO: currently, this is dependent on some things that are set up in +# TODO: currently, this is dependent on one thing that is set up in # site_webapp # -# (1) HAProxy -> couchdb -# (2) Apache +# (1) Apache # # It would be good in the future to make nickserver installable independently of # site_webapp. @@ -29,10 +28,9 @@ class site_nickserver { # the port that nickserver is actually running on $nickserver_local_port = '64250' - # couchdb is available on localhost via haproxy, which is bound to 4096. + # couchdb is available on localhost via stunnel, which is bound to 4000. $couchdb_host = 'localhost' - # See site_webapp/templates/haproxy_couchdb.cfg.erg - $couchdb_port = '4096' + $couchdb_port = '4000' $sources = hiera('sources') |