From 5bd90fd23c34874fa32880e27105b4bea130ec3b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 18 Mar 2013 23:25:20 +0100
Subject: added stunnel config for bigcouch communication

---
 provider_base/services/couchdb.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 0c407316..41f9695f 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -4,11 +4,13 @@
     "use": true
   },
   "stunnel": {
-    "couch_server": "= stunnel_server(couch.port)"
+    "couch_server": "= stunnel_server(couch.port)",
+    "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)"
   },
   "couch": {
     "port": 5984,
     "bigcouch": {
+      "port": 4369,
       "cookie": "= secret :bigcouch_cookie"
     },
     "users": {
-- 
cgit v1.2.3


From af141e738c8b90a11ff8009e2eed602b168e4fc3 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 20 Mar 2013 19:28:48 +0100
Subject: add stunnel hiera values to provider_base/services/couchdb.json for
 bigcouch cluster protocol

---
 provider_base/services/couchdb.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'provider_base/services')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 41f9695f..7b649da9 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -7,6 +7,7 @@
     "couch_server": "= stunnel_server(couch.port)",
     "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)"
   },
+  "stunnel": "= nextport = 4000; nodes_like_me[:services => :couchdb].values.inject({}) {|hsh, node| hsh[node.name + node.couch.bigcouch.port.to_s] =    {'accept_port' => nextport.to_s, 'connect' => node.domain.full }; nextport+=1; hsh}",
   "couch": {
     "port": 5984,
     "bigcouch": {
-- 
cgit v1.2.3


From 6f422863966a7e361f1c52be33a50e55bb39b9ff Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 20 Mar 2013 20:28:08 +0100
Subject: updated shorewall dnat hiera values for bigcouch cluster protocol

---
 provider_base/services/couchdb.json | 1 -
 1 file changed, 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 7b649da9..41f9695f 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -7,7 +7,6 @@
     "couch_server": "= stunnel_server(couch.port)",
     "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)"
   },
-  "stunnel": "= nextport = 4000; nodes_like_me[:services => :couchdb].values.inject({}) {|hsh, node| hsh[node.name + node.couch.bigcouch.port.to_s] =    {'accept_port' => nextport.to_s, 'connect' => node.domain.full }; nextport+=1; hsh}",
   "couch": {
     "port": 5984,
     "bigcouch": {
-- 
cgit v1.2.3


From baf3ed5b6db4e8af052564864d8c3e426cf5d9d0 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sun, 31 Mar 2013 12:32:42 -0400
Subject: switch to using stunnel_client and stunnel_server leap_cli macros add
 bigcouch_replication_clients to couchdb.json

change site_couchdb/manifests/stunnel to use stunnel_client and stunnel_server
generated hiera values to setup the stunnels for the couch_server connections,
and the bigcouch_replication_server and bigcouch_replication_clients tunnels
instead of using hard-coded ips and ports.

also change the pid names to be more consistent with what the tunnels are and
are named
---
 provider_base/services/couchdb.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 41f9695f..c00f08cd 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -5,7 +5,8 @@
   },
   "stunnel": {
     "couch_server": "= stunnel_server(couch.port)",
-    "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)"
+    "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)",
+    "bigcouch_replication_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.port)"
   },
   "couch": {
     "port": 5984,
-- 
cgit v1.2.3