Merge remote-tracking branch 'github/pull/323

[chef.git] / cookbooks / forum / recipes / default.rb

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 7c7c5b57b1e792cd15c4b3f0e2d2dfa27a3a6b45..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::fpm"
+include_recipe "php::apache"
 
 cache_dir = Chef::Config[:file_cache_path]
 
@@ -35,12 +35,9 @@ package %w[
   unzip
 ]
 
+apache_module "env"
 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]"