From dfbca127c61d8f5c6d69e7c9a4133880f0540456 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 2 May 2019 09:26:40 +0100 Subject: [PATCH] Redirect forum.osm.org to forum.openstreetmap.org for https connections --- cookbooks/forum/templates/default/apache.erb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 @@ - 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/ + + + + 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/ -- 2.43.2