From 8b75721b7941c8ab6b7dc05101e80a121dcb0849 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sun, 31 Mar 2013 12:09:45 -0400
Subject: shorewall: add couch_server stunnel port to macro.leap_couchdb, this
 is necessary for the stunnel to communicate

---
 puppet/modules/site_shorewall/manifests/couchdb.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_shorewall/manifests/couchdb.pp b/puppet/modules/site_shorewall/manifests/couchdb.pp
index 04b608e2..6a8c2cf2 100644
--- a/puppet/modules/site_shorewall/manifests/couchdb.pp
+++ b/puppet/modules/site_shorewall/manifests/couchdb.pp
@@ -2,7 +2,10 @@ class site_shorewall::couchdb {
 
   include site_shorewall::defaults
 
-  $couchdb_port = '6984'
+  $stunnel = hiera('stunnel')
+  $couch_server = $stunnel['couch_server']
+  $couch_stunnel_port = $couch_server['accept']
+
   # Erlang Port Mapper daemon, used for communication between
   # bigcouch cluster nodes
   $portmapper_port = '5369'
@@ -12,12 +15,11 @@ class site_shorewall::couchdb {
 
   # define macro for incoming services
   file { '/etc/shorewall/macro.leap_couchdb':
-    content => "PARAM   -       -       tcp    ${couchdb_port},${portmapper_port},${erlang_vm_port}",
+    content => "PARAM   -       -       tcp    ${couch_stunnel_port},${portmapper_port},${erlang_vm_port}",
     notify  => Service['shorewall'],
     require => Package['shorewall']
   }
 
-
   shorewall::rule {
       'net2fw-couchdb':
         source      => 'net',
-- 
cgit v1.2.3