From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Sep 2016 19:19:50 +0000 (+0100)
Subject: Default forum to https
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/85c89c0b9e5b66b5cc1ab2df52d614c27bc065a6

Default forum to https
---

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index 0eea9db34..5d505363b 100644
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -8,7 +8,7 @@
 	CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
 
-	DocumentRoot /srv/forum.openstreetmap.org/html/
+	RedirectPermanent / https://forum.openstreetmap.org/
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -24,5 +24,5 @@
 	CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
 
-	DocumentRoot /srv/forum.openstreetmap.org
+	DocumentRoot /srv/forum.openstreetmap.org/html
 </VirtualHost>