Drop mod_php support

diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb
index 4190ef3cb5aacdc74fe9e9381ede618c7154ae68..c0bd959a630852b4dfe1f7a6ef38b74e34dc4dd4 100644 (file)
--- a/cookbooks/dmca/recipes/default.rb
+++ b/cookbooks/dmca/recipes/default.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "apache"
-include_recipe "php::apache-fpm"
+include_recipe "php::apache"
 
 directory "/srv/dmca.openstreetmap.org" do
   owner "root"

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index d67ad5b8cde4417e32f4570bca3c760b2d4b739b..1c36bfb1e03025826bf9b18bc7c7f9631fe2fa5c 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
-include_recipe "php::apache-fpm"
+include_recipe "php::apache"
 
 package %w[
   php-cli

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 06929ec3e5ef533bff3c21ad307ce75b3c06e1dd..80694cf50bc19ad566a78e6940fddab0653681d4 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
-include_recipe "php::apache-fpm"
+include_recipe "php::apache"
 
 cache_dir = Chef::Config[:file_cache_path]
 

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 2977b5c420166a1ccd0d33f4cb01f543418ace8a..7dd28bb4e1047d07d050421f952413ddaf42d643 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -23,7 +23,7 @@ include_recipe "apt"
 include_recipe "git"
 include_recipe "memcached"
 include_recipe "mysql"
-include_recipe "php::apache-fpm"
+include_recipe "php::apache"
 
 # Mediawiki Base Requirements
 package %w[

diff --git a/cookbooks/php/recipes/apache-fpm.rb b/cookbooks/php/recipes/apache-fpm.rb
deleted file mode 100644 (file)
index 17ea43e..0000000
--- a/cookbooks/php/recipes/apache-fpm.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Cookbook:: php
-# Recipe:: apache-fpm
-#
-# Copyright:: 2020, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "apache"
-include_recipe "php::fpm"
-
-apache_module "proxy"
-apache_module "proxy_fcgi"
-
-apache_conf "php#{node[:php][:version]}-fpm" do
-  action :enable
-end

diff --git a/cookbooks/php/recipes/apache.rb b/cookbooks/php/recipes/apache.rb
index 62cf24d669d2021179df602490517a8c737c2c80..ead6a5f738df6aa066cf80b6f49c99d90d3d69ac 100644 (file)
--- a/cookbooks/php/recipes/apache.rb
+++ b/cookbooks/php/recipes/apache.rb
@@ -17,9 +17,12 @@
 # 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]}"
+apache_conf "php#{node[:php][:version]}-fpm" do
+  action :enable
+end

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 3b7a40057caa1f2bfe4abb56059005388abf45ca..990e1c33e84d85a997f13239518d740e30021b61 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -20,7 +20,7 @@
 include_recipe "apache"
 include_recipe "geoipupdate"
 include_recipe "mysql"
-include_recipe "php::apache-fpm"
+include_recipe "php::apache"
 
 passwords = data_bag_item("piwik", "passwords")
 

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index df45000376accb6e805cc3738b00ccf399032010..800d3c6004eb6106002854f5acdb9f83e1c3174a 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -22,7 +22,7 @@ include_recipe "apache"
 include_recipe "fail2ban"
 include_recipe "git"
 include_recipe "mysql"
-include_recipe "php::apache-fpm"
+include_recipe "php::apache"
 
 package %w[
   subversion