From 5c85dfff5fe83f13303a2a5ae70c56a3f2a05dfa Mon Sep 17 00:00:00 2001 From: poppen Date: Sat, 11 May 2013 21:33:33 +0900 Subject: [PATCH] Change to install official php-fpm package in RHEL 6.4 / CentOS 6.4 --- recipes/default.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 2447fda..00f51cd 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -64,16 +64,18 @@ end when 'amazon', 'fedora', 'centos', 'redhat' - yum_key 'RPM-GPG-KEY-remi' do - url 'http://rpms.famillecollet.com/RPM-GPG-KEY-remi' - end + unless platform?('centos', 'redhat') && node['platform_version'].to_f >= 6.4 + yum_key 'RPM-GPG-KEY-remi' do + url 'http://rpms.famillecollet.com/RPM-GPG-KEY-remi' + end - yum_repository 'remi' do - description 'Remi' - url 'http://rpms.famillecollet.com/enterprise/$releasever/remi/$basearch/' - mirrorlist 'http://rpms.famillecollet.com/enterprise/$releasever/remi/mirror' - key 'RPM-GPG-KEY-remi' - action :add + yum_repository 'remi' do + description 'Remi' + url 'http://rpms.famillecollet.com/enterprise/$releasever/remi/$basearch/' + mirrorlist 'http://rpms.famillecollet.com/enterprise/$releasever/remi/mirror' + key 'RPM-GPG-KEY-remi' + action :add + end end end