diff --git a/metadata.rb b/metadata.rb index 6d1061e..ec41ee3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'you@example.com' license 'All Rights Reserved' description 'Installs/Configures t42-common' long_description 'Installs/Configures t42-common' -version '0.1.9' +version '0.1.10' chef_version '>= 13.0' depends 'nodejs' diff --git a/recipes/mysql.rb b/recipes/mysql.rb index a0e6f86..1b3d90a 100644 --- a/recipes/mysql.rb +++ b/recipes/mysql.rb @@ -1,7 +1,7 @@ mysql_service node['app']['name'] do # version '5.7' bind_address node['db']['bind_address'] - port ['db']['port'] + port node['db']['port'] # data_dir '/data' initial_root_password node['db']['root_password'] @@ -11,9 +11,9 @@ end bash 'Make mysql Database and User' do code <<~EOH - mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "CREATE DATABASE #{node['db']['name']} /*\!40100 DEFAULT CHARACTER SET utf8 */;" - mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "CREATE USER #{node['db']['user']}@'%' IDENTIFIED BY '#{node['db']['password']}';" - mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "GRANT ALL PRIVILEGES ON #{node['db']['name']}.* TO '#{node['db']['user']}'@'localhost';" + mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "CREATE DATABASE '#{node['db']['name']}' /*\!40100 DEFAULT CHARACTER SET utf8 */;" + mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "CREATE USER '#{node['db']['user']}'@'%' IDENTIFIED BY '#{node['db']['password']}';" + mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "GRANT ALL PRIVILEGES ON '#{node['db']['name']}'.* TO '#{node['db']['user']}'@'localhost';" mysql -h 127.0.0.1 -uroot -p"#{node['db']['root_password']}" -e "FLUSH PRIVILEGES;" EOH