Merge branch 'release-1.0.1'

r8 · Apr 12, 2015 · 4ce7aa1 · 4ce7aa1
2 parents b4fb315 + a8025da
commit 4ce7aa1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [1.0.1] - 2015-04-12
+
+### Fixed
+- Fix MySQL socket path
+
 ## [1.0.0] - 2015-03-24
 
 ### Changed

diff --git a/cookbooks/vagrant_main/attributes/default.rb b/cookbooks/vagrant_main/attributes/default.rb
@@ -1,6 +1,7 @@
-override['mysql']['initial_root_password'] = 'vagrant'
 override['mysql']['version'] = '5.5'
 override['mysql']['port'] = '3306'
+override['mysql']['socket'] = '/var/run/mysqld/mysqld.sock'
+override['mysql']['initial_root_password'] = 'vagrant'
 
 override['percona']['apt_keyserver'] = 'keyserver.ubuntu.com'
 

diff --git a/cookbooks/vagrant_main/recipes/default.rb b/cookbooks/vagrant_main/recipes/default.rb
@@ -29,9 +29,10 @@
 end
 
 # Install Mysql
-mysql_service "default" do
+mysql_service 'default' do
   port node['mysql']['port']
   version node['mysql']['version']
+  socket node['mysql']['socket']
   initial_root_password node['mysql']['initial_root_password']
   action [:create, :start]
 end