summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-02-04 15:42:26 -0800
committerelijah <elijah@riseup.net>2015-02-04 15:42:26 -0800
commit1555cfa158c26ced05300402bbbce08081d62f7b (patch)
tree8a481e0d91cdb957c42261cbcda566cf8f1ff47b
parentaed223ad42635370bdbc1b239ed43a1330698c5e (diff)
upgrade to tapicero 0.6.1, to remove auth in process list (closes #6697)
-rw-r--r--provider_base/common.json2
-rw-r--r--puppet/modules/tapicero/templates/tapicero.yaml.erb1
2 files changed, 2 insertions, 1 deletions
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: