Merge pull request #567 from buzzdeee/master

Add OpenBSD support.
This commit is contained in:
Igor Galić 2015-03-12 10:55:17 +01:00
commit facb57a108
2 changed files with 35 additions and 2 deletions

View file

@ -251,6 +251,33 @@ class mysql::params {
$daemon_dev_package_name = undef $daemon_dev_package_name = undef
} }
'OpenBSD': {
$client_package_name = 'mariadb-client'
$server_package_name = 'mariadb-server'
$basedir = '/usr/local'
$config_file = '/etc/my.cnf'
$includedir = undef
$datadir = '/var/mysql'
$log_error = "/var/mysql/${::hostname}.err"
$pidfile = '/var/mysql/mysql.pid'
$root_group = 'wheel'
$server_service_name = 'mysqld'
$socket = '/var/run/mysql/mysql.sock'
$ssl_ca = undef
$ssl_cert = undef
$ssl_key = undef
$tmpdir = '/tmp'
# mysql::bindings
$java_package_name = undef
$perl_package_name = 'p5-DBD-mysql'
$php_package_name = 'php-mysql'
$python_package_name = 'py-mysql'
$ruby_package_name = 'ruby-mysql'
# The libraries installed by these packages are included in client and server packages, no installation required.
$client_dev_package_name = undef
$daemon_dev_package_name = undef
}
default: { default: {
case $::operatingsystem { case $::operatingsystem {
'Amazon': { 'Amazon': {

View file

@ -10,10 +10,16 @@ class mysql::server::service {
} }
} }
if $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['user'] {
$mysqluser = $mysql::server::override_options['mysqld']['user']
} else {
$mysqluser = $options['mysqld']['user']
}
file { $options['mysqld']['log-error']: file { $options['mysqld']['log-error']:
ensure => present, ensure => present,
owner => 'mysql', owner => $mysqluser,
group => 'mysql', group => $::mysql::server::root_group,
} }
service { 'mysqld': service { 'mysqld':