From 7bbae8df4e187f39241b081777323ab9f55f963e Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Jul 2022 18:07:22 +0100
Subject: [PATCH] Redirect piwik to matomo

---
 cookbooks/matomo/templates/default/apache.erb | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb
index 45b8bc0f3..589d563d6 100644
--- a/cookbooks/matomo/templates/default/apache.erb
+++ b/cookbooks/matomo/templates/default/apache.erb
@@ -2,9 +2,6 @@
 
 <VirtualHost *:443>
 	ServerName matomo.openstreetmap.org
-	ServerAlias matomo.osm.org
-	ServerAlias piwik.openstreetmap.org
-	ServerAlias piwik.osm.org
 	ServerAdmin webmaster@openstreetmap.org
 
 	SSLEngine on
@@ -24,6 +21,22 @@
 	Redirect 403 /tmp/
 </VirtualHost>
 
+<VirtualHost *:443>
+	ServerName matomo.osm.org
+	ServerAlias piwik.openstreetmap.org
+	ServerAlias piwik.osm.org
+	ServerAdmin webmaster@openstreetmap.org
+
+	SSLEngine on
+	SSLCertificateFile /etc/ssl/certs/matomo.openstreetmap.org.pem
+	SSLCertificateKeyFile /etc/ssl/private/matomo.openstreetmap.org.key
+
+	CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined
+	ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
+
+	RedirectPermanent / https://matomo.openstreetmap.org/
+</VirtualHost>
+
 <VirtualHost *:80>
 	ServerName matomo.openstreetmap.org
 	ServerAlias matomo.osm.org
-- 
2.45.1