X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9430f8a86c3e8e4b34a1f20f8c9cf00db5a1d7ec..802c8345a5d7084d60e6ba1cc3ab1e6d3ca9e8ea:/cookbooks/php/recipes/apache.rb

diff --git a/cookbooks/php/recipes/apache.rb b/cookbooks/php/recipes/apache.rb
index 7add78383..dc60248ba 100644
--- a/cookbooks/php/recipes/apache.rb
+++ b/cookbooks/php/recipes/apache.rb
@@ -17,7 +17,16 @@
 # limitations under the License.
 #
 
-include_recipe "php"
 include_recipe "apache"
+include_recipe "php::fpm"
 
-apache_module "php#{node[:php][:version]}"
+apache_module "proxy"
+apache_module "proxy_fcgi"
+
+apache_module "php#{node[:php][:version]}" do
+  action :disable
+end
+
+apache_conf "php#{node[:php][:version]}-fpm" do
+  action :enable
+end