summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-10-18 02:55:10 +0200
committermh <mh@immerda.ch>2011-10-18 02:55:10 +0200
commit8ff5e446d667278ff7ea468053860acf2b9059fd (patch)
treedf80ee42ff5624c135323e417b0bfcb59b18c7e8
parent585cbc381ba1fe3fe0c1172e049f7d7ba2639edf (diff)
make it possible to retrieve password from trocla
-rw-r--r--manifests/default_database.pp11
1 files changed, 6 insertions, 5 deletions
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")
+ },
},
}
}