Make php::fpm enable FPM support in apache

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 7c7c5b57b1e792cd15c4b3f0e2d2dfa27a3a6b45..82082e3fe0b0581aebcd61558ba2698b1480e12a 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -37,10 +37,6 @@ package %w[
 
 apache_module "rewrite"
 
 
 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]"
 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 33baba2abf260f3a823d479a1f5fec7e14d1ce2f..9932bcdcfd1acd808724ce8f45f8156a9073b2b1 100644 (file)
--- a/cookbooks/php/recipes/fpm.rb
+++ b/cookbooks/php/recipes/fpm.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apache"

 include_recipe "php"
 
 package "php-fpm"
 include_recipe "php"
 
 package "php-fpm"


@@ -24,3 +25,10 @@ package "php-fpm"
 service "php#{node[:php][:version]}-fpm" do
   action [:enable, :start]
 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