Merge branch 'master' into release

vccw-team · Aug 24, 2015 · 45c593d · 45c593d
2 parents 1756834 + d84a42a
commit 45c593d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/provision/site-cookbooks/vccw/recipes/phpenv.rb b/provision/site-cookbooks/vccw/recipes/phpenv.rb
@@ -5,14 +5,6 @@
 
 if /^[0-9]/ =~ node[:vccw][:phpenv][:php_version].to_s
 
-  packages = %w{httpd-devel libxml2-devel libcurl-devel libjpeg-turbo-devel libpng-devel giflib-devel gd-devel libmcrypt-devel sqlite-devel libtidy-devel libxslt-devel}
-
-  packages.each do |pkg|
-    package pkg do
-      action [:install, :upgrade]
-    end
-  end
-
   execute node[:vccw][:phpenv][:install] do
     user "root"
     group "root"

diff --git a/provision/site-cookbooks/wpcli/recipes/default.rb b/provision/site-cookbooks/wpcli/recipes/default.rb
@@ -6,7 +6,7 @@
 include_recipe "yum::remi"
 include_recipe 'php::package'
 
-packages = %w{git subversion zip unzip kernel-devel gcc perl make jq}
+packages = %w{git subversion zip unzip kernel-devel gcc perl make jq httpd-devel libxml2-devel libcurl-devel libjpeg-turbo-devel libpng-devel giflib-devel gd-devel libmcrypt-devel sqlite-devel libtidy-devel libxslt-devel}
 
 packages.each do |pkg|
   package pkg do