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 82082e3fe0b0581aebcd61558ba2698b1480e12a..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,6 +35,7 @@ package %w[
   unzip
 ]
 
+apache_module "env"
 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do