From 2bd603b9532fac70a25add8661acc94acb8598f8 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 20 Jun 2014 02:00:18 -0700
Subject: site_couchdb: support auto-stunnel setup, split master, bigcouch, and
 mirror out into separate files.

---
 puppet/modules/site_couchdb/manifests/setup.pp | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 puppet/modules/site_couchdb/manifests/setup.pp

(limited to 'puppet/modules/site_couchdb/manifests/setup.pp')

diff --git a/puppet/modules/site_couchdb/manifests/setup.pp b/puppet/modules/site_couchdb/manifests/setup.pp
new file mode 100644
index 00000000..e398356b
--- /dev/null
+++ b/puppet/modules/site_couchdb/manifests/setup.pp
@@ -0,0 +1,39 @@
+#
+# An initial setup class. All the other classes depend on this
+#
+class site_couchdb::setup {
+
+  # ensure that we don't have leftovers from previous installations
+  # where we installed the cloudant bigcouch package
+  # https://leap.se/code/issues/4971
+  class { 'couchdb::bigcouch::package::cloudant':
+    ensure => absent
+  }
+
+  # /etc/couchdb/couchdb.netrc is deployed by couchdb::query::setup
+  # we symlink this to /root/.netrc for couchdb_scripts (eg. backup)
+  # and makes life easier for the admin (i.e. using curl/wget without
+  # passing credentials)
+  file {
+    '/root/.netrc':
+      ensure  => link,
+      target  => '/etc/couchdb/couchdb.netrc';
+
+    '/srv/leap/couchdb':
+      ensure => directory
+  }
+
+  couchdb::query::setup { 'localhost':
+    user  => $site_couchdb::couchdb_admin_user,
+    pw    => $site_couchdb::couchdb_admin_pw,
+  }
+
+  vcsrepo { '/srv/leap/couchdb/scripts':
+    ensure   => present,
+    provider => git,
+    source   => 'https://leap.se/git/couchdb_scripts',
+    revision => 'origin/master',
+    require  => File['/srv/leap/couchdb']
+  }
+
+}
-- 
cgit v1.2.3


From 7778b20479d4d6789948dc24904ef9302980d983 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 23 Jun 2014 22:04:59 +0200
Subject: create netrc files for all users with new puppet_couchdb

This only works with the latest patch to puppet_couchdb
---
 puppet/modules/site_couchdb/manifests/setup.pp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_couchdb/manifests/setup.pp')

diff --git a/puppet/modules/site_couchdb/manifests/setup.pp b/puppet/modules/site_couchdb/manifests/setup.pp
index e398356b..69bd1c6a 100644
--- a/puppet/modules/site_couchdb/manifests/setup.pp
+++ b/puppet/modules/site_couchdb/manifests/setup.pp
@@ -10,11 +10,18 @@ class site_couchdb::setup {
     ensure => absent
   }
 
-  # /etc/couchdb/couchdb.netrc is deployed by couchdb::query::setup
+  $user = $site_couchdb::couchdb_admin_user
+
+  # /etc/couchdb/couchdb-admin.netrc is deployed by couchdb::query::setup
+  # we symlink to couchdb.netrc for puppet commands.
   # we symlink this to /root/.netrc for couchdb_scripts (eg. backup)
   # and makes life easier for the admin (i.e. using curl/wget without
   # passing credentials)
   file {
+    '/etc/couchdb/couchdb.netrc':
+      ensure  => link,
+      target  => "/etc/couchdb/couchdb-${user}.netrc";
+
     '/root/.netrc':
       ensure  => link,
       target  => '/etc/couchdb/couchdb.netrc';
@@ -24,7 +31,7 @@ class site_couchdb::setup {
   }
 
   couchdb::query::setup { 'localhost':
-    user  => $site_couchdb::couchdb_admin_user,
+    user  => $user,
     pw    => $site_couchdb::couchdb_admin_pw,
   }
 
-- 
cgit v1.2.3