Skip to content

Commit facb57a

Browse files
committed
Merge pull request #567 from buzzdeee/master
Add OpenBSD support.
2 parents 32329b7 + db72fe8 commit facb57a

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

manifests/params.pp

+27
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,33 @@
251251
$daemon_dev_package_name = undef
252252
}
253253

254+
'OpenBSD': {
255+
$client_package_name = 'mariadb-client'
256+
$server_package_name = 'mariadb-server'
257+
$basedir = '/usr/local'
258+
$config_file = '/etc/my.cnf'
259+
$includedir = undef
260+
$datadir = '/var/mysql'
261+
$log_error = "/var/mysql/${::hostname}.err"
262+
$pidfile = '/var/mysql/mysql.pid'
263+
$root_group = 'wheel'
264+
$server_service_name = 'mysqld'
265+
$socket = '/var/run/mysql/mysql.sock'
266+
$ssl_ca = undef
267+
$ssl_cert = undef
268+
$ssl_key = undef
269+
$tmpdir = '/tmp'
270+
# mysql::bindings
271+
$java_package_name = undef
272+
$perl_package_name = 'p5-DBD-mysql'
273+
$php_package_name = 'php-mysql'
274+
$python_package_name = 'py-mysql'
275+
$ruby_package_name = 'ruby-mysql'
276+
# The libraries installed by these packages are included in client and server packages, no installation required.
277+
$client_dev_package_name = undef
278+
$daemon_dev_package_name = undef
279+
}
280+
254281
default: {
255282
case $::operatingsystem {
256283
'Amazon': {

manifests/server/service.pp

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@
1010
}
1111
}
1212

13+
if $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['user'] {
14+
$mysqluser = $mysql::server::override_options['mysqld']['user']
15+
} else {
16+
$mysqluser = $options['mysqld']['user']
17+
}
18+
1319
file { $options['mysqld']['log-error']:
1420
ensure => present,
15-
owner => 'mysql',
16-
group => 'mysql',
21+
owner => $mysqluser,
22+
group => $::mysql::server::root_group,
1723
}
1824

1925
service { 'mysqld':

0 commit comments

Comments
 (0)