diff options
author | varac <varacanero@zeromail.org> | 2013-08-30 14:56:14 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-08-30 14:56:14 +0200 |
commit | f59e8b2e4aad3023f46ae3a1aad655b06605ee84 (patch) | |
tree | 6d514f109404da38e88973640504d7276333e208 /manifests | |
parent | ca467f2c8ec25132133e058f446217828b932671 (diff) |
couchdb: update_user_webapp fails (Bug #3611)
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/add_user.pp | 2 | ||||
-rw-r--r-- | manifests/update.pp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/manifests/add_user.pp b/manifests/add_user.pp index b3297eb..28826f3 100644 --- a/manifests/add_user.pp +++ b/manifests/add_user.pp @@ -25,7 +25,7 @@ define couchdb::add_user ( $roles, $pw, $salt = '' ) { # update the user with the given password unless they already work couchdb::update { "update_user_${name}": - port => $port, + host => "127.0.0.1:${port}", db => '_users', id => "org.couchdb.user:${name}", data => $data, diff --git a/manifests/update.pp b/manifests/update.pp index 579659b..b1dba84 100644 --- a/manifests/update.pp +++ b/manifests/update.pp @@ -1,6 +1,11 @@ -define couchdb::update ($db, $id, $data, $port='5984', $unless=undef) { +define couchdb::update ( + $db, + $id, + $data, + $host='127.0.0.1:5984', + $unless=undef) { - exec { "couch-doc-update --port ${port} --db ${db} --id ${id} --data \'${data}\'": + exec { "couch-doc-update --host ${host} --db ${db} --id ${id} --data \'${data}\'": require => Exec['wait_for_couchdb'], unless => $unless } |