Skip to content

Commit 2b91872

Browse files
committed
Merge pull request #210 from red-trela/fedora-19-mariadb
Cover Fedora 19's move from mysql to mariadb packages
2 parents e8e2367 + 3ca7d95 commit 2b91872

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

manifests/params.pp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,14 @@
4646

4747
case $::osfamily {
4848
'RedHat': {
49+
if $::operatingsystem == 'Fedora' and $::operatinsystemrelease >= 19 {
50+
$client_package_name = 'mariadb'
51+
$server_package_name = 'mariadb-server'
52+
} else {
53+
$client_package_name = 'mysql'
54+
$server_package_name = 'mysql-server'
55+
}
4956
$basedir = '/usr'
50-
$client_package_name = 'mysql'
5157
$config_file = '/etc/my.cnf'
5258
$datadir = '/var/lib/mysql'
5359
$tmpdir = '/tmp'
@@ -61,7 +67,6 @@
6167
$ruby_package_name = 'ruby-mysql'
6268
$ruby_package_provider = 'gem'
6369
$service_name = 'mysqld'
64-
$server_package_name = 'mysql-server'
6570
$socket = '/var/lib/mysql/mysql.sock'
6671
$ssl_ca = '/etc/mysql/cacert.pem'
6772
$ssl_cert = '/etc/mysql/server-cert.pem'

0 commit comments

Comments
 (0)