Skip to content

Commit bc66366

Browse files
committed
Upgrade mysql cookbook to 6.x. [bflad#103]
1 parent 97cbf79 commit bc66366

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

attributes/default.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
default['stash']['backup_client']['cron']['month'] = '*'
183183
default['stash']['backup_client']['cron']['weekday'] = '*'
184184

185+
default['stash']['database']['version'] = '5.6'
185186
default['stash']['database']['host'] = 'localhost'
186187
default['stash']['database']['name'] = 'stash'
187188
default['stash']['database']['password'] = 'changeit'

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
depends 'database'
2828
depends 'git'
2929
depends 'java'
30-
depends 'mysql', '~> 5.0'
30+
depends 'mysql', '~> 6.0'
3131
depends 'mysql2_chef_gem'
3232
depends 'mysql_connector'
3333
depends 'perl'

recipes/database.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,19 @@
77

88
case settings['database']['type']
99
when 'mysql'
10-
include_recipe 'mysql::server'
11-
1210
mysql2_chef_gem 'default' do
1311
action :install
1412
end
1513

14+
mysql_service 'default' do
15+
version settings['database']['version']
16+
bind_address settings['database']['host']
17+
port '3306'
18+
data_dir node['mysql']['data_dir'] if node['mysql']['data_dir']
19+
initial_root_password node['mysql']['server_root_password']
20+
action [:create, :start]
21+
end
22+
1623
database_connection.merge!(:username => 'root', :password => node['mysql']['server_root_password'])
1724

1825
mysql_database settings['database']['name'] do

0 commit comments

Comments
 (0)