From cce9af1fce42c29bf062cccfc46ef356d83a6328 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 23 Feb 2017 11:42:47 +0100
Subject: [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
---
 puppet/modules/site_webapp/manifests/couchdb.pp | 4 ++--
 puppet/modules/site_webapp/manifests/init.pp    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_webapp')

diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 175255af..ffe364c6 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -2,9 +2,9 @@
 class site_webapp::couchdb {
 
   $webapp                  = hiera('webapp')
-  # haproxy listener on port localhost:4096, see site_webapp::haproxy
+  # stunnel endpoint on port localhost:4000
   $couchdb_host            = 'localhost'
-  $couchdb_port            = '4096'
+  $couchdb_port            = '4000'
   $couchdb_webapp_user     = $webapp['couchdb_webapp_user']['username']
   $couchdb_webapp_password = $webapp['couchdb_webapp_user']['password']
   $couchdb_admin_user      = $webapp['couchdb_admin_user']['username']
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 83cf99a9..1ae80012 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -19,7 +19,6 @@ class site_webapp {
   include ::site_config::ruby::dev
   include ::site_webapp::apache
   include ::site_webapp::couchdb
-  include ::site_haproxy
   include ::site_webapp::cron
   include ::site_config::default
   include ::site_config::x509::cert
@@ -106,7 +105,9 @@ class site_webapp {
     '/srv/leap/webapp/public/ca.crt':
       ensure  => link,
       require => Vcsrepo['/srv/leap/webapp'],
+      # lint:ignore:variable_is_lowercase
       target  => "${x509::variables::local_CAs}/${site_config::params::ca_name}.crt";
+      # lint:endignore
 
     "/srv/leap/webapp/public/${api_version}":
       ensure  => directory,
-- 
cgit v1.2.3