Configure weighted plugin for gdnsd

[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 ad7a36d35a06f226bb3b933d6b64a6e40374d337..e84f1e35b5e1e3b69873c4def075a1f1af20d0bf 100644 (file)
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -13,7 +13,6 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-       ServerName forum.openstreetmap.org
        ServerAlias forum.osm.org
        ServerAdmin webmaster@openstreetmap.org
 
@@ -24,6 +23,20 @@
        CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
 
+       RedirectPermanent / https://forum.openstreetmap.org/
+</VirtualHost>
+
+<VirtualHost *:443>
+       ServerName forum.openstreetmap.org
+       ServerAdmin webmaster@openstreetmap.org
+
+       SSLEngine on
+       SSLCertificateFile /etc/ssl/certs/forum.openstreetmap.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/forum.openstreetmap.org.key
+
+       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
 
        php_admin_value open_basedir /srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/