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

handle mysql compiled without ssl

Browse source 
mysql doesn't allow ssl=true/false in my.cnf if it hasn't been compiled
with ssl, therefor add a new parameter ssl-disable which makes sure the
template doesn't write anything with ssl to the config.
This commit is contained in:
Robin Gloster 2014-02-28 19:07:48 +01:00
parent 7884ff744e
commit abcea00dcb
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/params.pp
View file

@ -212,6 +212,7 @@ class mysql::params {
'ssl-ca' => $mysql::params::ssl_ca, 'ssl-ca' => $mysql::params::ssl_ca,
'ssl-cert' => $mysql::params::ssl_cert, 'ssl-cert' => $mysql::params::ssl_cert,
'ssl-key' => $mysql::params::ssl_key, 'ssl-key' => $mysql::params::ssl_key,
'ssl-disable' => false,
'thread_cache_size' => '8', 'thread_cache_size' => '8',
'thread_stack' => '256K', 'thread_stack' => '256K',
'tmpdir' => $mysql::params::tmpdir, 'tmpdir' => $mysql::params::tmpdir,

4
templates/my.cnf.erb
View file

@ -2,7 +2,9 @@
<% if v.is_a?(Hash) -%> <% if v.is_a?(Hash) -%>
[<%= k %>] [<%= k %>]
<% v.sort.map do |ki, vi| -%> <% v.sort.map do |ki, vi| -%>
<% if vi == true or v == '' -%> <% if ki =~ /^ssl/ and v['ssl-disable'] == true -%>
<% next %>
<% elsif vi == true or v == '' -%>
<%= ki %> <%= ki %>
<% elsif vi.is_a?(Array) -%> <% elsif vi.is_a?(Array) -%>
<% vi.each do |vii| -%> <% vi.each do |vii| -%>