Make sure mod_php is disabled when we're using FPM

[chef.git] / cookbooks / php / recipes / apache.rb

diff --git a/cookbooks/php/recipes/apache.rb b/cookbooks/php/recipes/apache.rb
index 62cf24d669d2021179df602490517a8c737c2c80..dc60248ba189df86e46e9a7d0a2b30a2c191a00a 100644 (file)
--- a/cookbooks/php/recipes/apache.rb
+++ b/cookbooks/php/recipes/apache.rb
@@ -17,9 +17,16 @@
 # limitations under the License.
 #
 
-node.override[:apache][:mpm] = "prefork"
-
-include_recipe "php"
 include_recipe "apache"
+include_recipe "php::fpm"
+
+apache_module "proxy"
+apache_module "proxy_fcgi"
+
+apache_module "php#{node[:php][:version]}" do
+  action :disable
+end
 
-apache_module "php#{node[:php][:version]}"
+apache_conf "php#{node[:php][:version]}-fpm" do
+  action :enable
+end