From ac5d6987d33f32c394bef247361981a7c95377e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Mon, 4 Jun 2012 13:04:33 +0300
Subject: [PATCH] Added support for using MySQL with root password.

---
 mysql/manifests/init.pp | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/mysql/manifests/init.pp b/mysql/manifests/init.pp
index b51b373..8196122 100644
--- a/mysql/manifests/init.pp
+++ b/mysql/manifests/init.pp
@@ -17,6 +17,9 @@ class mysql::client {
 #   $mysql_datadir:
 #       Directory where MySQL databases are stored.
 #
+#   $mysql_root_password:
+#       Password for MySQL server root user.
+#
 class mysql::server {
 
     package { "mysql-server":
@@ -94,12 +97,28 @@ class mysql::server {
         require => Package["mysql-server"],
     }
 
-    file { "/var/lib/mysql":
-        ensure  => directory,
-        mode    => "0700",
-        owner   => "mysql",
-        group   => "mysql",
-        require => Package["mysql-server"],
+    case $mysql_root_password {
+        "": {
+            file { "/var/lib/mysql":
+                ensure  => directory,
+                mode    => "0700",
+                owner   => "mysql",
+                group   => "mysql",
+                require => Package["mysql-server"],
+            }
+        }
+        default: {
+            file { "/root/.my.cnf":
+                ensure  => present,
+                content => "[client]\nuser='root'\npassword='${mysql_root_password}'\n",
+                mode    => "0600",
+                owner   => "root",
+                group   => $operatingsystem ? {
+                    "openbsd" => "wheel",
+                    default   => "root",
+                },
+            }
+        }
     }
 
 }