Merge branch 'master' of ssh://code.leap.se/puppet_couchdb

Conflicts:
	manifests/create_db.pp

1 files changed, 4 insertions, 4 deletions

diff --git a/manifests/create_db.pp b/manifests/create_db.pp
index 22b3236..afab7b5 100644
--- a/manifests/create_db.pp
+++ b/manifests/create_db.pp
@@ -4,7 +4,7 @@ define couchdb::create_db (
   $readers="{\"names\": [], \"roles\": [] }" )
 {
 
-  Couchdb::Query["create_db_${name}"] -> Couchdb::Query["db_security_${name}"]
+  Couchdb::Query["create_db_${name}"] -> Couchdb::Document["${name}_security"]
 
   couchdb::query { "create_db_${name}":
     cmd    => 'PUT',
@@ -13,10 +13,10 @@ define couchdb::create_db (
     unless => "/usr/bin/curl -s --netrc-file /etc/couchdb/couchdb.netrc ${host}/${name} | grep -q -v '{\"error\":\"not_found\"'"
   }
 
-  couchdb::query { "db_security_${name}":
-    cmd  => 'PUT',
+  couchdb::document { "${name}_security":
+    db   => $name,
+    id   => '_security',
     host => $host,
-    url  => "${name}/_security",
     data => "{ \"admins\": ${admins}, \"readers\": ${readers} }"
   }
 }