From 155245aef3ade225bf601f7d6e1abbccb513ed57 Mon Sep 17 00:00:00 2001 From: Shane Auckland Date: Wed, 10 Dec 2014 16:40:23 +0000 Subject: [PATCH] Move php-mysql package to attribute file --- attributes/default.rb | 5 +++++ recipes/module_mysql.rb | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 2c67f7d6b..2179f2081 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -36,8 +36,10 @@ default['php']['ext_dir'] = "/usr/#{lib_dir}/php/modules" if node['platform_version'].to_f < 6 default['php']['packages'] = %w{ php53 php53-devel php53-cli php-pear } + default['php']['mysql']['package'] = 'php53-mysql' else default['php']['packages'] = %w{ php php-devel php-cli php-pear } + default['php']['mysql']['package'] = 'php-mysql' end when 'debian' default['php']['conf_dir'] = '/etc/php5/cli' @@ -45,12 +47,14 @@ default['php']['fpm_user'] = 'www-data' default['php']['fpm_group'] = 'www-data' default['php']['packages'] = %w{ php5-cgi php5 php5-dev php5-cli php-pear } + default['php']['mysql']['package'] = 'php5-mysql' when 'suse' default['php']['conf_dir'] = '/etc/php5/cli' default['php']['ext_conf_dir'] = '/etc/php5/conf.d' default['php']['fpm_user'] = 'wwwrun' default['php']['fpm_group'] = 'www' default['php']['packages'] = %w{ apache2-mod_php5 php5-pear } + default['php']['mysql']['package'] = 'php5-mysql' lib_dir = node['kernel']['machine'] =~ /x86_64/ ? 'lib64' : 'lib' when 'windows' default['php']['windows']['msi_name'] = 'PHP 5.3.28' @@ -77,6 +81,7 @@ default['php']['fpm_user'] = 'www-data' default['php']['fpm_group'] = 'www-data' default['php']['packages'] = %w{ php5-cgi php5 php5-dev php5-cli php-pear } + default['php']['mysql']['package'] = 'php5-mysql' end default['php']['url'] = 'http://us1.php.net/get' diff --git a/recipes/module_mysql.rb b/recipes/module_mysql.rb index 44a8b8004..89c82693d 100644 --- a/recipes/module_mysql.rb +++ b/recipes/module_mysql.rb @@ -19,14 +19,6 @@ # limitations under the License. # -pkg = value_for_platform( - %w(centos redhat scientific fedora amazon oracle) => { - el5_range => 'php53-mysql', - 'default' => 'php-mysql' - }, - 'default' => 'php5-mysql' -) - -package pkg do +package node['php']['mysql']['package'] do action :install end