From 1555cfa158c26ced05300402bbbce08081d62f7b Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 4 Feb 2015 15:42:26 -0800
Subject: upgrade to tapicero 0.6.1, to remove auth in process list (closes
 #6697)

---
 provider_base/common.json                           | 2 +-
 puppet/modules/tapicero/templates/tapicero.yaml.erb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provider_base/common.json b/provider_base/common.json
index 95ffa8d2..74c09efe 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -75,7 +75,7 @@
     "tapicero": {
       "type": "git",
       "source": "https://leap.se/git/tapicero",
-      "revision": "origin/version/0.6"
+      "revision": "origin/version/0.6.1"
     },
     "webapp": {
       "type": "git",
diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb
index 510450ad..40048a5e 100644
--- a/puppet/modules/tapicero/templates/tapicero.yaml.erb
+++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb
@@ -13,6 +13,7 @@ connection:
   password: <%= @couchdb_admin_password %>
   prefix : ""
   suffix : ""
+  netrc: "/etc/couchdb/couchdb.netrc"
 
 # file to store the last processed user record in so we can resume after
 # a restart:
-- 
cgit v1.2.3