Skip to content

Commit 6cfcdbd

Browse files
committed
do not emit other ssl directives when ssl = false
This is needed for newer versions of MariaDB, see issue #1509
1 parent 2a400ad commit 6cfcdbd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

templates/my.cnf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<% if v.is_a?(Hash) -%>
55
[<%= k %>]
66
<% v.sort.map do |ki, vi| -%>
7-
<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) -%>
7+
<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) or (ki =~ /^ssl-/ and v['ssl'] == false) -%>
88
<% next %>
99
<% elsif vi == true or vi == '' -%>
1010
<%= ki %>

0 commit comments

Comments
 (0)