From 61eca267cb52252371a71926a64d7f3b7350489d Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 29 Aug 2013 12:16:01 +0200 Subject: puppet couchdb module doesn't create necessary databases anymore (Bug #3594) --- manifests/create_db.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/manifests/create_db.pp b/manifests/create_db.pp index 91c4a1d..22b3236 100644 --- a/manifests/create_db.pp +++ b/manifests/create_db.pp @@ -1,15 +1,16 @@ -define couchdb::create_db ( $host='127.0.0.1:5984', - $admins="{\"names\": [], \"roles\": [] }", - $readers="{\"names\": [], \"roles\": [] }" ) +define couchdb::create_db ( + $host='127.0.0.1:5984', + $admins="{\"names\": [], \"roles\": [] }", + $readers="{\"names\": [], \"roles\": [] }" ) { Couchdb::Query["create_db_${name}"] -> Couchdb::Query["db_security_${name}"] couchdb::query { "create_db_${name}": - cmd => 'PUT', - host => $host, - url => $name, - unless => "/usr/bin/curl --netrc-file /etc/couchdb/couchdb.netrc ${host}/${name}" + cmd => 'PUT', + host => $host, + url => $name, + unless => "/usr/bin/curl -s --netrc-file /etc/couchdb/couchdb.netrc ${host}/${name} | grep -q -v '{\"error\":\"not_found\"'" } couchdb::query { "db_security_${name}": -- cgit v1.2.3