From 8ff5e446d667278ff7ea468053860acf2b9059fd Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 18 Oct 2011 02:55:10 +0200
Subject: make it possible to retrieve password from trocla

---
 manifests/default_database.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/default_database.pp b/manifests/default_database.pp
index 34b986f..7465eaf 100644
--- a/manifests/default_database.pp
+++ b/manifests/default_database.pp
@@ -1,6 +1,4 @@
 # create default database
-# generate hashed password with:
-# ruby -r'digest/sha1' -e 'puts "*" + Digest::SHA1.hexdigest(Digest::SHA1.digest(ARGV[0])).upcase' PASSWORD
 define mysql::default_database(
   $username = 'absent',
   $password = 'absent',
@@ -32,9 +30,12 @@ define mysql::default_database(
     ]
     if $ensure == 'present' {
       Mysql_user["${real_username}@${host}"]{
-        password_hash => $password_is_encrypted ? {
-          true => "$password",
-          default => mysql_password("$password")
+        password_hash => $password ? {
+        'trocla' => trocla("mysql_${real_username}",'mysql'),
+        default => $password_is_encrypted ? {
+            true => "$password",
+            default => mysql_password("$password")
+          },
         },
       }
     }
-- 
cgit v1.2.3