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

Merge pull request #691 from buzzdeee/master

Browse source 
Fix regression introduced by adding OpenBSD support.
This commit is contained in:
Morgan Haskel 2015-03-18 10:53:44 -07:00
commit 97b7223f48
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -246,6 +246,10 @@ Whether the service should be restarted when things change. Valid values are 'tr
The name of the group used for root. Can be a group name or a group ID. See more about the [`group` file attribute](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group).
#####`mysql_group`
The name of the group of the mysql daemon user. Can be a group name or a group ID. See more about the [`group` file attribute](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-group).
#####`package_ensure`
Whether the package exists or should be a specific version. Valid values are 'present', 'absent', or 'x.y.z'. Defaults to 'present'.

8
manifests/params.pp
View file

@ -76,6 +76,7 @@ class mysql::params {
$basedir = '/usr'
$datadir = '/var/lib/mysql'
$root_group = 'root'
$mysql_group = 'mysql'
$socket = '/var/lib/mysql/mysql.sock'
$ssl_ca = '/etc/mysql/cacert.pem'
$ssl_cert = '/etc/mysql/server-cert.pem'
@ -125,6 +126,7 @@ class mysql::params {
/(SLES|SLED)/ => '/var/lib/mysql/mysqld.pid',
}
$root_group = 'root'
$mysql_group = 'mysql'
$server_service_name = 'mysql'
$socket = $::operatingsystem ? {
/OpenSuSE/ => '/var/run/mysql/mysql.sock',
@ -158,6 +160,7 @@ class mysql::params {
$log_error = '/var/log/mysql/error.log'
$pidfile = '/var/run/mysqld/mysqld.pid'
$root_group = 'root'
$mysql_group = 'mysql'
$server_service_name = 'mysql'
$socket = '/var/run/mysqld/mysqld.sock'
$ssl_ca = '/etc/mysql/cacert.pem'
@ -187,6 +190,7 @@ class mysql::params {
$log_error = '/var/log/mysqld.log'
$pidfile = '/var/run/mysqld/mysqld.pid'
$root_group = 'root'
$mysql_group = 'mysql'
$server_service_name = 'mysqld'
$socket = '/var/lib/mysql/mysql.sock'
$ssl_ca = '/etc/mysql/cacert.pem'
@ -210,6 +214,7 @@ class mysql::params {
$log_error = '/var/log/mysql/mysqld.err'
$pidfile = '/run/mysqld/mysqld.pid'
$root_group = 'root'
$mysql_group = 'mysql'
$server_service_name = 'mysql'
$socket = '/run/mysqld/mysqld.sock'
$ssl_ca = '/etc/mysql/cacert.pem'
@ -234,6 +239,7 @@ class mysql::params {
$log_error = "/var/db/mysql/${::hostname}.err"
$pidfile = '/var/db/mysql/mysql.pid'
$root_group = 'wheel'
$mysql_group = 'mysql'
$server_service_name = 'mysql-server'
$socket = '/tmp/mysql.sock'
$ssl_ca = undef
@ -261,6 +267,7 @@ class mysql::params {
$log_error = "/var/mysql/${::hostname}.err"
$pidfile = '/var/mysql/mysql.pid'
$root_group = 'wheel'
$mysql_group = '_mysql'
$server_service_name = 'mysqld'
$socket = '/var/run/mysql/mysql.sock'
$ssl_ca = undef
@ -290,6 +297,7 @@ class mysql::params {
$log_error = '/var/log/mysqld.log'
$pidfile = '/var/run/mysqld/mysqld.pid'
$root_group = 'root'
$mysql_group = 'mysql'
$server_service_name = 'mysqld'
$socket = '/var/lib/mysql/mysql.sock'
$ssl_ca = '/etc/mysql/cacert.pem'

1
manifests/server.pp
View file

@ -13,6 +13,7 @@ class mysql::server (
$remove_default_accounts = false,
$restart = $mysql::params::restart,
$root_group = $mysql::params::root_group,
$mysql_group = $mysql::params::mysql_group,
$root_password = $mysql::params::root_password,
$service_enabled = $mysql::params::server_service_enabled,
$service_manage = $mysql::params::server_service_manage,

2
manifests/server/service.pp
View file

@ -21,7 +21,7 @@ class mysql::server::service {
file { $options['mysqld']['log-error']:
ensure => present,
owner => $mysqluser,
group => $::mysql::server::root_group,
group => $::mysql::server::mysql_group,
}
service { 'mysqld':