Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

fix #487 mysql not starting if ssl is not disabled #488

Merged
merged 1 commit into from

2 participants

@globin

follow-up on #477 fixing #487

@apenney apenney merged commit 22b6b76 into puppetlabs:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 6, 2014
  1. @globin
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  templates/my.cnf.erb
View
2  templates/my.cnf.erb
@@ -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 %>
Something went wrong with that request. Please try again.