handle mysql compiled without ssl
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:
parent
7884ff744e
commit
abcea00dcb
2 changed files with 4 additions and 1 deletions
|
@ -212,6 +212,7 @@ class mysql::params {
|
|||
'ssl-ca' => $mysql::params::ssl_ca,
|
||||
'ssl-cert' => $mysql::params::ssl_cert,
|
||||
'ssl-key' => $mysql::params::ssl_key,
|
||||
'ssl-disable' => false,
|
||||
'thread_cache_size' => '8',
|
||||
'thread_stack' => '256K',
|
||||
'tmpdir' => $mysql::params::tmpdir,
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
<% if v.is_a?(Hash) -%>
|
||||
[<%= k %>]
|
||||
<% 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 %>
|
||||
<% elsif vi.is_a?(Array) -%>
|
||||
<% vi.each do |vii| -%>
|
||||
|
|
Loading…
Reference in a new issue