From f9a5a2d75b0d2b5637ee17a3b78616f2371e427d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 12 Jul 2020 19:30:07 +0100 Subject: [PATCH] Make php::fpm enable FPM support in apache --- cookbooks/forum/recipes/default.rb | 4 ---- cookbooks/php/recipes/fpm.rb | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb index 7c7c5b57b..82082e3fe 100644 --- a/cookbooks/forum/recipes/default.rb +++ b/cookbooks/forum/recipes/default.rb @@ -37,10 +37,6 @@ package %w[ apache_module "rewrite" -apache_conf "php#{node[:php][:version]}-fpm" do - action :enable -end - ssl_certificate "forum.openstreetmap.org" do domains ["forum.openstreetmap.org", "forum.osm.org"] notifies :reload, "service[apache2]" diff --git a/cookbooks/php/recipes/fpm.rb b/cookbooks/php/recipes/fpm.rb index 33baba2ab..9932bcdcf 100644 --- a/cookbooks/php/recipes/fpm.rb +++ b/cookbooks/php/recipes/fpm.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "apache" include_recipe "php" package "php-fpm" @@ -24,3 +25,10 @@ package "php-fpm" 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 -- 2.39.5