From 3ca7d958dff8115262090ad0e62ef828bad90db5 Mon Sep 17 00:00:00 2001 From: Sandro Mathys Date: Fri, 5 Jul 2013 10:53:56 +0200 Subject: [PATCH] Cover Fedora 19's move from mysql to mariadb packages --- manifests/params.pp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 125eb07..932f34f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -46,8 +46,14 @@ class mysql::params { case $::osfamily { 'RedHat': { + if $::operatingsystem == 'Fedora' and $::operatinsystemrelease >= 19 { + $client_package_name = 'mariadb' + $server_package_name = 'mariadb-server' + } else { + $client_package_name = 'mysql' + $server_package_name = 'mysql-server' + } $basedir = '/usr' - $client_package_name = 'mysql' $config_file = '/etc/my.cnf' $datadir = '/var/lib/mysql' $tmpdir = '/tmp' @@ -61,7 +67,6 @@ class mysql::params { $ruby_package_name = 'ruby-mysql' $ruby_package_provider = 'gem' $service_name = 'mysqld' - $server_package_name = 'mysql-server' $socket = '/var/lib/mysql/mysql.sock' $ssl_ca = '/etc/mysql/cacert.pem' $ssl_cert = '/etc/mysql/server-cert.pem'