Merge branch 'master' of git://git.puppet.immerda.ch/module-mysql

Conflicts:
	files/scripts/optimize_tables.rb
	manifests/server/base.pp

1 files changed, 28 insertions, 2 deletions

diff --git a/manifests/server/centos.pp b/manifests/server/centos.pp
index a55a57f..5c0ab34 100644
--- a/manifests/server/centos.pp
+++ b/manifests/server/centos.pp
@@ -1,9 +1,35 @@
 # centos specific things
 class mysql::server::centos inherits mysql::server::clientpackage {
-  Service['mysql']{
-    name  => 'mysqld',
+  if $::operatingsystemmajrelease > 6 {
+    Package['mysql-server']{
+      name  => 'mariadb-server',
+    }
+    Service['mysql']{
+      name  => 'mariadb',
+    }
+  } else {
+    Service['mysql']{
+      name  => 'mysqld',
+    }
   }
   File['mysql_main_cnf']{
     path => '/etc/my.cnf',
   }
+
+  file{
+    '/etc/mysql':
+      ensure  => directory,
+      owner   => root,
+      group   => 0,
+      mode    => '0644';
+    '/etc/mysql/conf.d':
+      ensure  => directory,
+      recurse => true,
+      purge   => true,
+      force   => true,
+      owner   => root,
+      group   => 0,
+      mode    => '0644',
+      notify  => Service['mysql'];
+  }
 }