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

Switch to using MySQL 5.5 by default #112

Merged
merged 2 commits into from
Jul 9, 2015
Merged

Switch to using MySQL 5.5 by default #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b1ea24
Switched to using MySQL 5.5 by default.
patcon Jul 9, 2015
13c8826
Let mysql cookbook determine default version unless overridden.
patcon Jul 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@
default['stash']['backup_diy']['hipchat_token'] = ''

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

default['stash']['database']['host'] = '127.0.0.1'
default['stash']['database']['name'] = 'stash'
Expand Down
4 changes: 2 additions & 2 deletions recipes/database.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
case settings['database']['type']
when 'mysql'
mysql2_chef_gem 'default' do
client_version settings['database']['version']
client_version settings['database']['version'] if settings['database']['version']
action :install
end

mysql_service 'default' do
version settings['database']['version']
version settings['database']['version'] if settings['database']['version']
bind_address settings['database']['host']
# See: https://github.com/chef-cookbooks/mysql/pull/361
port settings['database']['port'].to_s
Expand Down