Permalink
Browse files

Merge pull request #488 from Mayflower/master

fix #487 mysql not starting if ssl is not disabled
  • Loading branch information...
2 parents 501448c + e4d63f7 commit 22b6b76ac29a5cf1350e1e4295ad19d0cf8ad23a Ashley Penney committed Mar 6, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 templates/my.cnf.erb
View
@@ -2,7 +2,7 @@
<% if v.is_a?(Hash) -%>
[<%= k %>]
<% v.sort.map do |ki, vi| -%>
-<% if ki =~ /^ssl/ and v['ssl-disable'] == true -%>
+<% if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) -%>
<% next %>
<% elsif vi == true or v == '' -%>
<%= ki %>

0 comments on commit 22b6b76

Please sign in to comment.