Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #245 from slamere/trusty_mysql_version

Update mysql_version to a valid version on trusty
  • Loading branch information...
commit 5a5dc33401e09d77e410e57bde4464d0afa1284e 2 parents 23b5828 + 08bafac
@railsmachine-ops railsmachine-ops authored
View
2  lib/moonshine/manifest/rails/mysql.rb
@@ -105,7 +105,7 @@ def mysql_query(sql)
def mysql_version
if ubuntu_lucid?
5.1
- elsif ubuntu_precise?
+ elsif ubuntu_precise? || ubuntu_trusty?
5.5
else
5.0
View
2  lib/moonshine/manifest/rails/templates/moonshine.cnf.erb
@@ -14,7 +14,7 @@ collation_server = <%= configuration[:mysql][:collation_server] || 'utf8_
######### replication
server-id = <%= configuration[:mysql][:server_id] || '1' %>
auto-increment-increment = <%= configuration[:mysql][:auto_increment_increment] || '10' %>
-auto-increment-offset = <%= configuration[:mysql][:auto_increment_offset] || configuration[:mysql][:server_id] || '1' %><% if configuration[:mysql][:version] > 5 or ubuntu_trusty? %>
+auto-increment-offset = <%= configuration[:mysql][:auto_increment_offset] || configuration[:mysql][:server_id] || '1' %><% if configuration[:mysql][:version] > 5 %>
binlog_format = mixed<% end %>
log-bin = <%= configuration[:mysql][:log_bin] || "#{log_prefix}-bin" %>
log-bin-index = <%= configuration[:mysql][:log_bin_index] || "#{log_prefix}-bin" %>
Please sign in to comment.
Something went wrong with that request. Please try again.