From d683f05d7f468c5040ee5debb7a9d23f25608aba Mon Sep 17 00:00:00 2001 From: ericrdb Date: Wed, 5 Feb 2014 15:39:48 -0700 Subject: [PATCH] Issue #2069081 Install uploadprogress --- cookbooks/core/vdd/recipes/php.rb | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/cookbooks/core/vdd/recipes/php.rb b/cookbooks/core/vdd/recipes/php.rb index 9eb85ee..d3e8a2f 100644 --- a/cookbooks/core/vdd/recipes/php.rb +++ b/cookbooks/core/vdd/recipes/php.rb @@ -1,18 +1,19 @@ if node["php"]["version"] node.override["php"]["version"] = node["php"]["version"] node.override["php"]["configure_options"]["mysql"] = false - require_recipe "php::source" + include_recipe "php::source" else - require_recipe "php" + include_recipe "php" end -require_recipe "apache2::mod_php5" +include_recipe "apache2::mod_php5" pkgs = [ "php5-gd", "php5-mysql", "php5-mcrypt", - "php5-curl" + "php5-curl", + "php5-dev" ] pkgs.each do |pkg| @@ -21,6 +22,25 @@ pkgs.each do |pkg| end end +#bash "install-uploadprogress" do +# user "root" +# code <<-EOH +# pecl install uploadprogress +# EOH +#end + + +# install the uploadprogress pecl +php_pear "uploadprogress" do + action :install +end + +#template "/etc/php5/apache2/conf.d/vdd_uploadprogress.ini" do +# source "vdd_uploadprogress.ini.erb" +# mode "0644" +# notifies :restart, "service[apache2]", :delayed +#end + template "/etc/php5/apache2/conf.d/vdd_php.ini" do source "vdd_php.ini.erb" mode "0644" -- 1.8.4.2 From e65de05c9f56067dee4694e0fe110d28eb3ca8ba Mon Sep 17 00:00:00 2001 From: ericrdb Date: Wed, 5 Feb 2014 16:19:54 -0700 Subject: [PATCH] Clean up files --- cookbooks/core/vdd/recipes/php.rb | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cookbooks/core/vdd/recipes/php.rb b/cookbooks/core/vdd/recipes/php.rb index d3e8a2f..9216746 100644 --- a/cookbooks/core/vdd/recipes/php.rb +++ b/cookbooks/core/vdd/recipes/php.rb @@ -22,25 +22,10 @@ pkgs.each do |pkg| end end -#bash "install-uploadprogress" do -# user "root" -# code <<-EOH -# pecl install uploadprogress -# EOH -#end - - -# install the uploadprogress pecl php_pear "uploadprogress" do action :install end -#template "/etc/php5/apache2/conf.d/vdd_uploadprogress.ini" do -# source "vdd_uploadprogress.ini.erb" -# mode "0644" -# notifies :restart, "service[apache2]", :delayed -#end - template "/etc/php5/apache2/conf.d/vdd_php.ini" do source "vdd_php.ini.erb" mode "0644" -- 1.8.4.2