opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Use mariadb by default for Debian Jessie (#845)"

Browse source 
This reverts commit af85cf7dfb. It turned out to
be a very bad idea to change the defaults. To fix this in the long term, the
module needs to separate product/version selection from the OS-defaults. For now,
please supply those values through the main parameters to select mariadb.
This commit is contained in:
David Schmitt 2016-05-25 11:28:29 +01:00
parent a563fcbb09
commit 7f590704c5
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manifests/params.pp
View file

@ -159,19 +159,8 @@ class mysql::params {
}
'Debian': {
if $::lsbdistid == 'Debian' and $::lsbdistcodename == 'jessie' {
$client_package_name = 'mariadb-client'
$server_package_name = 'mariadb-server'
$client_dev_package_name = 'libmariadb-client-lgpl-dev'
$daemon_dev_package_name = 'libmariadb-dev'
} else {
$client_package_name = 'mysql-client'
$server_package_name = 'mysql-server'
$client_dev_package_name = 'libmysqlclient-dev'
$daemon_dev_package_name = 'libmysqld-dev'
}
$client_package_name = 'mysql-client'
$server_package_name = 'mysql-server'
$basedir = '/usr'
$config_file = '/etc/mysql/my.cnf'
@ -197,6 +186,8 @@ class mysql::params {
'jessie' => 'ruby-mysql',
default => 'libmysql-ruby',
}
$client_dev_package_name = 'libmysqlclient-dev'
$daemon_dev_package_name = 'libmysqld-dev'
}
'Archlinux': {