Default forum to https

[chef.git] / cookbooks / forum / templates / default / apache.erb

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index 0eea9db34beaa007ec453b726ad270ac53612674..5d505363b77546cd5514b544a3eb1cff7c828505 100644 (file)
--- 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
 
        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>
 </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
 
        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>
 </VirtualHost>