From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Jul 2020 08:08:40 +0000 (+0100)
Subject: Make sure mod_php is disabled when we're using FPM
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/0ed2895f04e6f0c5bbe3911d689c20e4b485938f

Make sure mod_php is disabled when we're using FPM
---

diff --git a/cookbooks/php/recipes/apache.rb b/cookbooks/php/recipes/apache.rb
index ead6a5f73..dc60248ba 100644
--- a/cookbooks/php/recipes/apache.rb
+++ b/cookbooks/php/recipes/apache.rb
@@ -23,6 +23,10 @@ include_recipe "php::fpm"
 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