From 7f590704c5b818b36fcde1b11a1377d8b62c5384 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 25 May 2016 11:28:29 +0100 Subject: [PATCH] Revert "Use mariadb by default for Debian Jessie (#845)" This reverts commit af85cf7dfb1c3d0cab5b123cdf7ccfe40b7b90d3. 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. --- manifests/params.pp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 7c88c37..130d816 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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': {