Skip to content

14870 Allow custom my cnf #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

14870 Allow custom my cnf #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
36d4269
Dependency listed in modulefile is only for puppet < 2.7
Feb 27, 2012
c65e2ee
Correctly error out when a user passes something other then true or f…
Mar 7, 2012
b2b9649
passwords starting with - no longer fail
Mar 8, 2012
956ccc3
Add home_root_password variable to control wether password gets store…
Mar 8, 2012
afd0358
only add .my.cnf order preference if we are indeed using it
Mar 8, 2012
5a7ecc3
Merge branch 'master' of github.com:Tribily/puppetlabs-mysql
Mar 12, 2012
e4e9a95
Allow passing a custome my.cnf
May 7, 2012
fa5544c
Adjust readme slightly (could use more work)
May 10, 2012
fefac0d
Added missing template
Jun 1, 2012
ee82a0a
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-mysql
Jun 7, 2012
b305a2e
Add support for custom my.cnf template
Jun 7, 2012
41252a7
Stop tracking debian.cnf
Jun 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
$ssl_key = $mysql::params::ssl_key,
$log_error = $mysql::params::log_error,
$default_engine = 'UNSET',
$root_group = $mysql::params::root_group
$root_group = $mysql::params::root_group,
$my_cnf_template = 'mysql/my.cnf.erb'
) inherits mysql::params {

File {
Expand Down Expand Up @@ -115,7 +116,7 @@
mode => '0755',
}
file { $config_file:
content => template('mysql/my.cnf.erb'),
content => template($my_cnf_template),
mode => '0644',
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$ssl = false

case $::operatingsystem {
"Ubuntu": {
'Ubuntu': {
$service_provider = upstart
}
default: {
Expand Down