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

Merge pull request #847 from DavidS/revert-mariadb-defaults

Browse source 
Revert "Use mariadb by default for Debian Jessie (#845)"
This commit is contained in:
TP Honey 2016-05-25 12:26:48 +01:00
commit 9fc34d49f0
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': { 'Debian': {
if $::lsbdistid == 'Debian' and $::lsbdistcodename == 'jessie' { $client_package_name = 'mysql-client'
$client_package_name = 'mariadb-client' $server_package_name = 'mysql-server'
$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'
}
$basedir = '/usr' $basedir = '/usr'
$config_file = '/etc/mysql/my.cnf' $config_file = '/etc/mysql/my.cnf'
@ -197,6 +186,8 @@ class mysql::params {
'jessie' => 'ruby-mysql', 'jessie' => 'ruby-mysql',
default => 'libmysql-ruby', default => 'libmysql-ruby',
} }
$client_dev_package_name = 'libmysqlclient-dev'
$daemon_dev_package_name = 'libmysqld-dev'
} }
'Archlinux': { 'Archlinux': {