Some fixes for myql cookbook re: ubuntu 12.04

jasherai · Aug 2, 2012 · cb65aa0 · cb65aa0
1 parent 2c3a8b8
commit cb65aa0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/mysql/recipes/client.rb b/mysql/recipes/client.rb
@@ -42,12 +42,6 @@
   end
 end
 
-if platform?(%w{ redhat centos fedora suse scientific amazon })
-  package 'ruby-mysql'
-elsif platform?(%w{ debian ubuntu })
-  package "libmysql-ruby"
-else
-  gem_package "mysql" do
-    action :install
-  end
+gem_package "mysql" do
+  action :install
 end
diff --git a/mysql/recipes/server.rb b/mysql/recipes/server.rb
@@ -61,7 +61,7 @@
   action :install
 end
 
-directory "#{node['mysql']['conf_dir']}/mysql/conf.d" do
+directory "#{node['mysql']['conf_dir']}/conf.d" do
   owner "mysql"
   group "mysql"
   action :create

diff --git a/mysql/templates/default/my.cnf.erb b/mysql/templates/default/my.cnf.erb
@@ -172,5 +172,5 @@ old_passwords           = <%= node['mysql']['old_passwords'] %>
 # * IMPORTANT: Additional settings that can override those from this file!
 #   The files must end with '.cnf', otherwise they'll be ignored.
 #
-!includedir <%= node['mysql']['conf_dir'] %>/mysql/conf.d/
+!includedir <%= node['mysql']['conf_dir'] %>/conf.d/
 <% end -%>