only create or update a user record if needed

We test the user account by trying to use it to retrieve / on the couch which prints a welcome message if the user is valid and returns a 401 otherwise.

2 files changed, 6 insertions, 3 deletions

diff --git a/manifests/add_user.pp b/manifests/add_user.pp
index 9c8e5d4..73cfbf1 100644
--- a/manifests/add_user.pp
+++ b/manifests/add_user.pp
@@ -23,10 +23,12 @@ define couchdb::add_user ( $roles, $pw, $salt = '' ) {
     $data = "{\"type\": \"user\", \"name\": \"${name}\", \"roles\": ${roles}, \"password_sha\": \"${sha}\", \"salt\": \"${salt}\"}"
   }
 
+  # update the user with the given password unless they already work
   couchdb::update { "update_user_${name}":
     port => $port,
     db   => '_users',
     id   => "org.couchdb.user:${name}",
-    data => $data
+    data => $data,
+    unless => "curl -f ${name}:${pw}@127.0.0.1:${port}/"
   }
 }
diff --git a/manifests/update.pp b/manifests/update.pp
index b7e6fc1..bbd2591 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,6 +1,7 @@
-define couchdb::update ($db, $id, $data, $port='5984') {
+define couchdb::update ($db, $id, $data, $port='5984', $unless='/bin/false') {
 
   exec { "couch-doc-update --port ${port} --db ${db} --id ${id} --data \'${data}\'":
-    require => Exec['wait_for_couchdb']
+    require => Exec['wait_for_couchdb'],
+    unless  => $unless
   }
 }