From f96d049c407110fb471199ee73c47db8b7cd474a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 23 May 2013 22:42:56 +0200
Subject: Install git before vcsrepo call (Feature #2510)

---
 puppet/modules/site_config/manifests/default.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 77241df5..7758a69d 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -33,4 +33,7 @@ class site_config::default {
 
   # include basic shorewall config
   include site_shorewall::defaults
+
+  Class['git'] -> Vcsrepo<||>
+
 }
-- 
cgit v1.2.3


From ddb899b650e63c5557370fb7a3b2c3bfd14b1ce7 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 23 May 2013 18:51:13 +0200
Subject: added couch.bigcouch.neighbors to provider_base/services/couchdb.json

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

diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 43a6c650..ba07733c 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -15,7 +15,8 @@
     "bigcouch": {
       "epmd_port": 4369,
       "ednp_port": 9002,
-      "cookie": "= secret :bigcouch_cookie"
+      "cookie": "= secret :bigcouch_cookie",
+      "neighbors": "= nodes_like_me[:services => :couchdb].exclude(self).field('domain.full')"
     },
     "users": {
       "admin": {
-- 
cgit v1.2.3


From 064195792e264a125b9bd75ff931552af054ecf9 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 23 May 2013 18:53:17 +0200
Subject: include site_couchdb::bigcouch::add_nodes in
 site_couchdb/manifests/init.pp

---
 puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp | 5 +++++
 puppet/modules/site_couchdb/manifests/init.pp               | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp

diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
new file mode 100644
index 00000000..241a4914
--- /dev/null
+++ b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
@@ -0,0 +1,5 @@
+class site_couchdb::bigcouch::add_nodes {
+  # loop through neighbors array and add nodes
+  $nodes = $::site_couchdb::bigcouch_config['neighbors']
+  couchdb::bigcouch::add_node { $nodes: }
+}
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 9f4824b4..802f3224 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -33,9 +33,12 @@ class site_couchdb {
     bigcouch_cookie => $bigcouch_cookie,
     ednp_port       => $ednp_port
   }
-  include couchdb::bigcouch::package::cloudant
 
-  Service ['couchdb']
+  class { 'couchdb::bigcouch::package::cloudant': }
+
+  Class ['couchdb::bigcouch::package::cloudant']
+    -> Service ['couchdb']
+    -> Class ['site_couchdb::bigcouch::add_nodes']
     -> Couchdb::Create_db['users']
     -> Couchdb::Create_db['tokens']
     -> Couchdb::Add_user[$couchdb_webapp_user]
@@ -47,6 +50,8 @@ class site_couchdb {
     ca   => $ca
   }
 
+  class { 'site_couchdb::bigcouch::add_nodes': }
+
   couchdb::query::setup { 'localhost':
     user  => $couchdb_admin_user,
     pw    => $couchdb_admin_pw,
-- 
cgit v1.2.3


From fed63320dc026f8ea1e0f0de250c8008f6f71b7e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 23 May 2013 18:06:00 -0400
Subject: update couchdb submodule to get couchdb::bigcouch::add_node and
 couchdb::bigcouch::query

---
 puppet/modules/couchdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
index 7b6c9a29..20deb065 160000
--- a/puppet/modules/couchdb
+++ b/puppet/modules/couchdb
@@ -1 +1 @@
-Subproject commit 7b6c9a29b1333ce733dd5d7c0dadd7f90513b261
+Subproject commit 20deb0652ccfe105eddec6ba2ad32b8d633705f6
-- 
cgit v1.2.3