From 42145601c1cc268c1b120d75f6d4e5f455a8c103 Mon Sep 17 00:00:00 2001
From: Jan Collijs <jan.collijs@inuits.eu>
Date: Thu, 16 May 2013 09:37:50 +0200
Subject: [PATCH 1/6] Puppet-lint 0.3.2 qualified code

---
 .puppet-lint.rc        | 1 +
 manifests/adminpass.pp | 2 +-
 manifests/service.pp   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index b0d12b7..fb37551 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +1,2 @@
 --no-80chars-check
+--no-class_inherits_from_params_class-check
diff --git a/manifests/adminpass.pp b/manifests/adminpass.pp
index cf11239..a3baf69 100644
--- a/manifests/adminpass.pp
+++ b/manifests/adminpass.pp
@@ -48,7 +48,7 @@
 ) {
 
   exec {"percona-adminpass-${name}":
-    onlyif => [
+    onlyif    => [
       'test -f /usr/bin/mysqladmin',
       "mysqladmin -u${user} -h${host} status",
     ],
diff --git a/manifests/service.pp b/manifests/service.pp
index 921cf48..81fe610 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -9,8 +9,8 @@
 
   if $::percona::server {
     service { $service_name:
-      alias   => 'mysql',
       ensure  => $service_ensure,
+      alias   => 'mysql',
       enable  => $service_enable,
       require => [
         Class['percona::config::server'],

From 925a7e3c7c012ce790d6f98f860ae841ebe8f9fa Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Thu, 23 May 2013 14:38:11 +0200
Subject: [PATCH 2/6] fix a syntax error in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fdf1a4a..e756bee 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ For debian users, the config_include_dir has been defaulted to /etc/mysql/conf.d
     percona::rights {'userbar on dbfoo':
       priv => 'select_priv',
       host => 'localhost',
-      database => '*'
+      database => '*',
       password => 'default',
     }
 

From becd4deecdc0acbb244e8023eb2b50d0cce2a9b6 Mon Sep 17 00:00:00 2001
From: Lars Fronius <l.fronius@googlemail.com>
Date: Tue, 16 Jul 2013 16:54:33 +0200
Subject: [PATCH 3/6] client tools might use client section

---
 templates/mgmt_cnf.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/mgmt_cnf.erb b/templates/mgmt_cnf.erb
index 7dc83d7..354b610 100644
--- a/templates/mgmt_cnf.erb
+++ b/templates/mgmt_cnf.erb
@@ -2,6 +2,10 @@
 ## Served by:        '<%= scope.lookupvar('::servername') %>' 
 ## Module:           '<%= scope.to_hash['module_name'] %>' 
 ## Template source:  'MODULES<%= template_source.gsub(Regexp.new("^#{Puppet::Node::Environment.current[:modulepath].gsub(':','|')}"),"") %>'
+[client]
+  user = <%= user %>
+  password = <%= password %>
+
 [mysql]
   user = <%= user %>
   password = <%= password %>

From 7599cb670ceb5cc7311f758ac666bb2795415e09 Mon Sep 17 00:00:00 2001
From: Vadim Lebedev <abraham1901@gmail.com>
Date: Tue, 30 Jul 2013 11:16:58 -0700
Subject: [PATCH 4/6] Bug fix

Debug: Exec[percona-adminpass-root](provider=posix): Executing check 'mysqladmin -uroot -hlocalhost --no-defaults status'
Debug: Executing 'mysqladmin -uroot -hlocalhost --no-defaults status'
---
 manifests/adminpass.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/adminpass.pp b/manifests/adminpass.pp
index 7fd9c4c..719caef 100644
--- a/manifests/adminpass.pp
+++ b/manifests/adminpass.pp
@@ -50,7 +50,7 @@
   exec {"percona-adminpass-${name}":
     onlyif    => [
       'test -f /usr/bin/mysqladmin',
-      "mysqladmin -u${user} -h${host} --no-defaults status",
+      "mysqladmin --no-defaults -u${user} -h${host}  status",
     ],
     path      => ['/usr/bin','/bin',],
     command   => "mysqladmin -h ${host} -u${user} password ${password}",

From f499f309a8657720d65b8d16dd990719937618a4 Mon Sep 17 00:00:00 2001
From: erik-smit <smite@zylon.net>
Date: Wed, 4 Dec 2013 11:38:52 +0100
Subject: [PATCH 5/6] =localhost on line 36, so user@host/database syntax is
 broken with a forced localhost host

---
 manifests/rights.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/rights.pp b/manifests/rights.pp
index 6ac33f8..a3d67e9 100644
--- a/manifests/rights.pp
+++ b/manifests/rights.pp
@@ -111,8 +111,8 @@
 
   ## Host param
   $_host = $host ? {
-    undef   => $default_host,
-    default => $host,
+    'localhost' => $default_host,
+    default     => $host,
   }
 
   ## Database param

From 113f1a0d0b336a38a1f52ebfe6bc5c10aeb2c13b Mon Sep 17 00:00:00 2001
From: erik-smit <smite@zylon.net>
Date: Wed, 4 Dec 2013 13:19:10 +0100
Subject: [PATCH 6/6] Example is false. Repl_slave_priv is not a valid priv
 when a database is defined.

---
 manifests/init.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3b22b73..2dd6fd4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,7 +46,6 @@
 #       percona::rights {'Set rights for replication':
 #         user     => 'repl',
 #         password => 'repl',
-#         database => ['%'],
 #         priv     => ['Repl_slave_priv'],
 #         host     => '$hostname',
 #       }