diff options
| author | Micah Anderson <micah@leap.se> | 2015-02-05 11:42:28 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-02-05 11:42:28 -0500 |
| commit | e4e7959d5dee3b0c3e4c2daaf0355c870b97c942 (patch) | |
| tree | a91f08fea4cd24314292d0ebf0c3032d6944afb7 | |
| parent | 1d8998f1ee74c4b68cf9372409ef7e6e47f63927 (diff) | |
| parent | 1555cfa158c26ced05300402bbbce08081d62f7b (diff) | |
Merge branch 'bug/6697' into develop
| -rw-r--r-- | provider_base/common.json | 2 | ||||
| -rw-r--r-- | puppet/modules/tapicero/templates/tapicero.yaml.erb | 1 |
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: |