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

Merge pull request #718 from igalic/slalomzacharyd-fixed-for-mariadb

Browse source 
Fixed server package name so it isn't hardcoded to mysql
This commit is contained in:
Igor Galić 2015-05-27 13:37:21 +02:00
commit 31f0c4f1b1
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/server/installdb.pp
View file

@ -11,8 +11,7 @@ class mysql::server::installdb {
if $mysql::server::manage_config_file { if $mysql::server::manage_config_file {
$install_db_args = "--basedir=${basedir} --defaults-extra-file=${config_file} --datadir=${datadir} --user=${mysqluser}" $install_db_args = "--basedir=${basedir} --defaults-extra-file=${config_file} --datadir=${datadir} --user=${mysqluser}"
} else {
$install_db_args = "--basedir=${basedir} --datadir=${datadir} --user=${mysqluser}"
} }
exec { 'mysql_install_db': exec { 'mysql_install_db':
@ -20,7 +19,7 @@ class mysql::server::installdb {
creates => "${datadir}/mysql", creates => "${datadir}/mysql",
logoutput => on_failure, logoutput => on_failure,
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
require => Package['mysql-server'], require => Package[$mysql::server::package_name],
} }
if $mysql::server::restart { if $mysql::server::restart {

2
manifests/server/service.pp
View file

@ -31,7 +31,7 @@ class mysql::server::service {
name => $mysql::server::service_name, name => $mysql::server::service_name,
enable => $mysql::server::real_service_enabled, enable => $mysql::server::real_service_enabled,
provider => $mysql::server::service_provider, provider => $mysql::server::service_provider,
require => Package['mysql-server'], require => Package[$mysql::server::service_name],
} }
# only establish ordering between config file and service if # only establish ordering between config file and service if