2 files changed, 7 insertions, 5 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 71450370..e1947048 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -1,9 +1,10 @@
+# Configures webapp couchdb config
 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            = $webapp['couchdb_port']
   $couchdb_webapp_user     = $webapp['couchdb_webapp_user']['username']
   $couchdb_webapp_password = $webapp['couchdb_webapp_user']['password']
   $couchdb_admin_user      = $webapp['couchdb_admin_user']['username']
@@ -22,8 +23,8 @@ class site_webapp::couchdb {
     # couchdb.admin.yml is a symlink to prevent the vcsrepo resource
     # from changing its user permissions every time.
     '/srv/leap/webapp/config/couchdb.admin.yml':
-      ensure => 'link',
-      target => '/etc/leap/couchdb.admin.yml',
+      ensure  => 'link',
+      target  => '/etc/leap/couchdb.admin.yml',
       require => Vcsrepo['/srv/leap/webapp'];
 
     '/etc/leap/couchdb.admin.yml':
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,