From 66d16bfc802d59c8561946e352d628a83019fb18 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Sep 2016 21:03:30 +0100
Subject: [PATCH] Fix a few forum configuration issues

---
 cookbooks/forum/recipes/default.rb           | 3 ++-
 cookbooks/forum/templates/default/apache.erb | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 4bf5765f2..4ab841062 100644
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -28,6 +28,7 @@ package "php-mysql"
 package "php-apcu"
 
 apache_module "php7.0"
+apache_module "rewrite"
 
 apache_site "default" do
   action [:disable]
@@ -67,7 +68,7 @@ end
 template "/srv/forum.openstreetmap.org/html/config.php" do
   source "config.php.erb"
   owner "forum"
-  group "forum"
+  group "www-data"
   mode 0o440
   variables :passwords => passwords
 end
diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index d84b01967..4b3c844c8 100644
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -29,9 +29,12 @@
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
-           RewriteEngine on
+        RewriteEngine on
+        RewriteRule ^config\.php$ - [F,L]
 
-           RewriteRule ^config\.php$ - [F,L]
+        Options -Indexes
+
+        Require all granted
 </Directory>
 
 <Directory /srv/forum.openstreetmap.org/html/img>
-- 
2.39.5