From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Jul 2020 19:27:15 +0000 (+0100)
Subject: Separate php::apache-fpm frpm php::fpm
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/16b15f75a3eeeb17abce1510dd2a286151ea86cc

Separate php::apache-fpm frpm php::fpm

Create a new php::apache-fpm recipe that configures apache
to use FPM for PHP scripts.
---

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 82082e3fe..9128f73de 100644
--- 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::fpm"
+include_recipe "php::apache-fpm"
 
 cache_dir = Chef::Config[:file_cache_path]
 
diff --git a/cookbooks/php/recipes/apache-fpm.rb b/cookbooks/php/recipes/apache-fpm.rb
new file mode 100644
index 000000000..17ea43e9b
--- /dev/null
+++ b/cookbooks/php/recipes/apache-fpm.rb
@@ -0,0 +1,28 @@
+#
+# 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/fpm.rb b/cookbooks/php/recipes/fpm.rb
index 3b4a1d1c1..0be8bafe3 100644
--- a/cookbooks/php/recipes/fpm.rb
+++ b/cookbooks/php/recipes/fpm.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
 include_recipe "php"
 
 package "php-fpm"
@@ -33,10 +32,3 @@ end
 service "php#{node[:php][:version]}-fpm" do
   action [:enable, :start]
 end
-
-apache_module "proxy"
-apache_module "proxy_fcgi"
-
-apache_conf "php#{node[:php][:version]}-fpm" do
-  action :enable
-end