X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2c06ac9ac5299064c209c63af2323b2c28186e3c..709c582dd58742d3a1ba083f9105efdb17a5de6e:/cookbooks/forum/templates/default/apache.erb

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index ad7a36d35..e84f1e35b 100644
--- 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/