Merge branch 'COOK-834'

patcon · Nov 28, 2011 · 6fe424e · 6fe424e
2 parents 5604d7b + 22871a3
commit 6fe424e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/mysql/attributes/server.rb b/mysql/attributes/server.rb
@@ -21,7 +21,7 @@
 default['mysql']['data_dir']                   = "/var/lib/mysql"
 
 case node["platform"]
-when "centos", "redhat", "fedora", "suse"
+when "centos", "redhat", "fedora", "suse", "scientific", "amazon"
   set['mysql']['conf_dir']                    = '/etc'
   set['mysql']['socket']                      = "/var/lib/mysql/mysql.sock"
   set['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"

diff --git a/mysql/metadata.rb b/mysql/metadata.rb
@@ -9,7 +9,7 @@
 recipe            "mysql::server", "Installs packages required for mysql servers w/o manual intervention"
 recipe            "mysql::server_ec2", "Performs EC2-specific mountpoint manipulation"
 
-%w{ debian ubuntu centos suse fedora redhat }.each do |os|
+%w{ debian ubuntu centos suse fedora redhat scientific amazon }.each do |os|
   supports os
 end
 

diff --git a/mysql/recipes/client.rb b/mysql/recipes/client.rb
@@ -21,15 +21,15 @@
 
 package "mysql-client" do
   package_name value_for_platform(
-    [ "centos", "redhat", "suse", "fedora"] => { "default" => "mysql" },
+    [ "centos", "redhat", "suse", "fedora", "scientific", "amazon"] => { "default" => "mysql" },
     "default" => "mysql-client"
   )
   action :install
 end
 
 package "mysql-devel" do
   package_name begin
-    if platform?(%w{ centos redhat suse fedora })
+    if platform?(%w{ centos redhat suse fedora scientific amazon })
       "mysql-devel"
     elsif debian_before_squeeze? || ubuntu_before_lucid?
       "libmysqlclient15-dev"
@@ -40,7 +40,7 @@
   action :install
 end
 
-if platform?(%w{ redhat centos fedora suse })
+if platform?(%w{ redhat centos fedora suse scientific amazon })
   package 'ruby-mysql'
 elsif platform?(%w{ debian ubuntu })
   package "libmysql-ruby"

diff --git a/mysql/recipes/server.rb b/mysql/recipes/server.rb
@@ -62,7 +62,7 @@
 end
 
 service "mysql" do
-  service_name value_for_platform([ "centos", "redhat", "suse", "fedora" ] => {"default" => "mysqld"}, "default" => "mysql")
+  service_name value_for_platform([ "centos", "redhat", "suse", "fedora", "scientific", "amazon" ] => {"default" => "mysqld"}, "default" => "mysql")
   if (platform?("ubuntu") && node.platform_version.to_f >= 10.04)
     restart_command "restart mysql"
     stop_command "stop mysql"
@@ -73,9 +73,9 @@
 end
 
 skip_federated = case node['platform']
-                 when 'fedora', 'ubuntu'
+                 when 'fedora', 'ubuntu', 'amazon'
                    true
-                 when 'centos', 'redhat'
+                 when 'centos', 'redhat', 'scientific'
                    node['platform_version'].to_f < 6.0
                  else
                    false

diff --git a/mysql/templates/default/my.cnf.erb b/mysql/templates/default/my.cnf.erb
@@ -157,7 +157,7 @@ key_buffer              = <%= node['mysql']['tunable']['max_allowed_packet'] %>
 # ndb-connectstring=127.0.0.1
 
 <% case node['platform'] -%>
-<% when "centos", "redhat", "fedora", "suse" -%>
+<% when "centos", "redhat", "fedora", "suse", "scientific", "amazon"-%>
 #
 # * BerkeleyDB
 #