Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit af7d078

Browse files
committed
Merge pull request #112 from patcon/feature/111-mysql55
Switch to using MySQL 5.5 by default
2 parents ec7ac26 + 13c8826 commit af7d078

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

attributes/default.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@
205205
default['stash']['backup_diy']['hipchat_token'] = ''
206206

207207
default['stash']['database']['type'] = 'mysql'
208-
default['stash']['database']['version'] = '5.6'
208+
# When not set, the defaults from mysql cookbook are used.
209+
# See: https://github.com/chef-cookbooks/mysql/blob/v6.0.26/libraries/helpers.rb#L414-L432
210+
default['stash']['database']['version'] = nil
209211

210212
default['stash']['database']['host'] = '127.0.0.1'
211213
default['stash']['database']['name'] = 'stash'

recipes/database.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
case settings['database']['type']
99
when 'mysql'
1010
mysql2_chef_gem 'default' do
11-
client_version settings['database']['version']
11+
client_version settings['database']['version'] if settings['database']['version']
1212
action :install
1313
end
1414

1515
mysql_service 'default' do
16-
version settings['database']['version']
16+
version settings['database']['version'] if settings['database']['version']
1717
bind_address settings['database']['host']
1818
# See: https://github.com/chef-cookbooks/mysql/pull/361
1919
port settings['database']['port'].to_s

0 commit comments

Comments
 (0)