diff options
| author | varac <varacanero@zeromail.org> | 2013-08-29 19:26:36 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-08-29 19:26:36 +0200 |
| commit | 32a0f9df6e80c15b3b49b8ad81b9a49ecc6f39dd (patch) | |
| tree | 7d180ca7bf135523969956ed468b6224ff44ece8 /manifests/query.pp | |
| parent | 61eca267cb52252371a71926a64d7f3b7350489d (diff) | |
| parent | 321d463b43dc44a4f313aa6dabef1a8bdce27122 (diff) | |
Merge branch 'master' of ssh://code.leap.se/puppet_couchdb
Conflicts:
manifests/create_db.pp
Diffstat (limited to 'manifests/query.pp')
| -rw-r--r-- | manifests/query.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/query.pp b/manifests/query.pp index 6d13c2b..0549ded 100644 --- a/manifests/query.pp +++ b/manifests/query.pp @@ -1,7 +1,7 @@ define couchdb::query ( - $cmd, $url, $host='127.0.0.1:5984', $data = '{}', $unless = undef) { + $cmd, $path, $host='127.0.0.1:5984', $data = '{}', $unless = undef) { - exec { "/usr/bin/curl --netrc-file /etc/couchdb/couchdb.netrc -X ${cmd} ${host}/${url} --data \'${data}\'": + exec { "/usr/bin/curl --netrc-file /etc/couchdb/couchdb.netrc -X ${cmd} ${host}/${path} --data \'${data}\'": require => [ Package['curl'], Exec['wait_for_couchdb'] ], unless => $unless } |