From db669a6911c55d9a5675fb4b42f4de5728f34c76 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 19 Jun 2014 00:02:54 -0700
Subject: couchdb: generate hiera files suitable for plain couchdb + read-only
 mirrors

---
 provider_base/services/couchdb.json | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'provider_base/services/couchdb.json')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 5f1b5381..d75fd8de 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -3,20 +3,11 @@
         "use": true
     },
     "stunnel": {
-        "couch_server": "= stunnel_server(couch.port)",
-        "epmd_server": "= stunnel_server(couch.bigcouch.epmd_port)",
-        "epmd_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.epmd_port)",
-        "ednp_server": "= stunnel_server(couch.bigcouch.ednp_port)",
-        "ednp_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.ednp_port)"
+        "couch_server": "= stunnel_server(couch.port)"
     },
     "couch": {
+        "master": false,
         "port": 5984,
-        "bigcouch": {
-            "epmd_port": 4369,
-            "ednp_port": 9002,
-            "cookie": "= secret :bigcouch_cookie",
-            "neighbors": "= nodes_like_me[:services => :couchdb].exclude(self).field('domain.full')"
-        },
         "users": {
             "admin": {
                 "username": "admin",
@@ -49,8 +40,8 @@
                 "salt": "= hex_secret :couch_webapp_password_salt, 128"
             }
         },
-    "webapp": {
-         "nagios_test_pw": "= secret :nagios_test_password"
+        "webapp": {
+            "nagios_test_pw": "= secret :nagios_test_password"
         }
     }
 }
-- 
cgit v1.2.3


From 49f0c54a05f6b542367f8ef4538316ba2eaac6cd Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 20 Jun 2014 01:58:39 -0700
Subject: new generic system for stunnel: just `include site_stunnel` and
 stunnel + needed shorewall will be automatically set up. requires new
 leap_cli

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

(limited to 'provider_base/services/couchdb.json')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index d75fd8de..c2482235 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -3,7 +3,9 @@
         "use": true
     },
     "stunnel": {
-        "couch_server": "= stunnel_server(couch.port)"
+        "servers": {
+          "couch_server": "= stunnel_server(couch.port)"
+        }
     },
     "couch": {
         "master": false,
-- 
cgit v1.2.3


From a8f6415b0869018fd8d4ac947814529e8e85ace2 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 20 Jun 2014 19:10:44 +0200
Subject: add replication user

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

(limited to 'provider_base/services/couchdb.json')

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index c2482235..8b1386f8 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -40,6 +40,11 @@
                 "username": "webapp",
                 "password": "= secret :couch_webapp_password",
                 "salt": "= hex_secret :couch_webapp_password_salt, 128"
+            },
+            "replication": {
+                "username": "replication",
+                "password": "= secret :couch_replication_password",
+                "salt": "= hex_secret :couch_replication_password_salt, 128"
             }
         },
         "webapp": {
-- 
cgit v1.2.3