From 866af737a3e641008c05a210d04a4dc5e5bcfbc4 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 20 Dec 2016 10:12:39 -0800
Subject: bugfix: couchdb nodes should not require soledad. closes #8693

---
 puppet/modules/site_couchdb/manifests/create_dbs.pp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/site_couchdb/manifests')

diff --git a/puppet/modules/site_couchdb/manifests/create_dbs.pp b/puppet/modules/site_couchdb/manifests/create_dbs.pp
index ddfb7d65..1c594bb6 100644
--- a/puppet/modules/site_couchdb/manifests/create_dbs.pp
+++ b/puppet/modules/site_couchdb/manifests/create_dbs.pp
@@ -1,5 +1,6 @@
 # creates neccesary databases
 class site_couchdb::create_dbs {
+  $services = hiera('services', [])
 
   Class['site_couchdb::setup']
     -> Class['site_couchdb::create_dbs']
@@ -42,10 +43,12 @@ class site_couchdb::create_dbs {
 
   ## shared database
   ## r/w: soledad
-  couchdb::create_db { 'shared':
-    members => "{ \"names\": [\"${site_couchdb::couchdb_soledad_user}\"], \"roles\": [\"replication\"] }",
-    require => Couchdb::Query::Setup['localhost'],
-    notify  => Service['soledad-server'];
+  if member($services, 'soledad') {
+    couchdb::create_db { 'shared':
+      members => "{ \"names\": [\"${site_couchdb::couchdb_soledad_user}\"], \"roles\": [\"replication\"] }",
+      require => Couchdb::Query::Setup['localhost'],
+      notify  => Service['soledad-server'];
+    }
   }
 
   ## tickets database
-- 
cgit v1.2.3


From c1f23241deb1f94eb35e6ef21e623d804fa2770e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 30 Dec 2016 18:44:27 +0100
Subject: Couchdb service should not require on soledad

- Resolves: #8693
---
 puppet/modules/site_couchdb/manifests/add_users.pp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/site_couchdb/manifests')

diff --git a/puppet/modules/site_couchdb/manifests/add_users.pp b/puppet/modules/site_couchdb/manifests/add_users.pp
index f12c5a5e..5c32c1e3 100644
--- a/puppet/modules/site_couchdb/manifests/add_users.pp
+++ b/puppet/modules/site_couchdb/manifests/add_users.pp
@@ -1,6 +1,8 @@
 # add couchdb users for all services
 class site_couchdb::add_users {
 
+  $services = hiera('services', [])
+
   Class['site_couchdb::create_dbs']
     -> Class['site_couchdb::add_users']
 
@@ -29,12 +31,14 @@ class site_couchdb::add_users {
   ## soledad couchdb user
   ## r/w: user-<uuid>, shared
   ## read: tokens
-  couchdb::add_user { $site_couchdb::couchdb_soledad_user:
-    roles   => '["tokens"]',
-    pw      => $site_couchdb::couchdb_soledad_pw,
-    salt    => $site_couchdb::couchdb_soledad_salt,
-    require => Couchdb::Query::Setup['localhost'],
-    notify  => Service['soledad-server'];
+  if member($services, 'soledad') {
+    couchdb::add_user { $site_couchdb::couchdb_soledad_user:
+      roles   => '["tokens"]',
+      pw      => $site_couchdb::couchdb_soledad_pw,
+      salt    => $site_couchdb::couchdb_soledad_salt,
+      require => Couchdb::Query::Setup['localhost'],
+      notify  => Service['soledad-server'];
+    }
   }
 
   ## webapp couchdb user
-- 
cgit v1.2.3


From aaf1cbe103d17820feffa09c8dcb6e1fef12e236 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Thu, 27 Jul 2017 09:12:15 +0200
Subject: Bug: remove shared couchdb design docs

Soledad is now taking care of the design of said database.
Closes #8428
---
 puppet/modules/site_couchdb/manifests/designs.pp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'puppet/modules/site_couchdb/manifests')

diff --git a/puppet/modules/site_couchdb/manifests/designs.pp b/puppet/modules/site_couchdb/manifests/designs.pp
index e5fd94c6..33687999 100644
--- a/puppet/modules/site_couchdb/manifests/designs.pp
+++ b/puppet/modules/site_couchdb/manifests/designs.pp
@@ -11,6 +11,14 @@ class site_couchdb::designs {
     mode    => '0755'
   }
 
+  #cleanup leftovers from before soledad created its db
+  file {
+    '/srv/leap/couchdb/designs/shared/':
+    ensure  => absent,
+    recurse => true,
+    force   => true,
+  }
+
   site_couchdb::upload_design {
     'customers':    design => 'customers/Customer.json';
     'identities':   design => 'identities/Identity.json';
@@ -19,15 +27,6 @@ class site_couchdb::designs {
     'users':        design => 'users/User.json';
     'tmp_users':    design => 'users/User.json';
     'invite_codes': design => 'invite_codes/InviteCode.json';
-    'shared_docs':
-      db => 'shared',
-      design => 'shared/docs.json';
-    'shared_syncs':
-      db => 'shared',
-      design => 'shared/syncs.json';
-    'shared_transactions':
-      db => 'shared',
-      design => 'shared/transactions.json';
   }
 
   $sessions_db      = rotated_db_name('sessions', 'monthly')
-- 
cgit v1.2.3