Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb
index 45b8bc0f305aecdc07374791eb91e2fcec4c245e..589d563d6ceb01826448224b607f12e410630c0f 100644 (file)
--- a/cookbooks/matomo/templates/default/apache.erb
+++ b/cookbooks/matomo/templates/default/apache.erb
@@ -2,9 +2,6 @@
 
 <VirtualHost *:443>
        ServerName matomo.openstreetmap.org
 
 <VirtualHost *:443>
        ServerName matomo.openstreetmap.org

-       ServerAlias matomo.osm.org
-       ServerAlias piwik.openstreetmap.org
-       ServerAlias piwik.osm.org

        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on


@@ -24,6 +21,22 @@
        Redirect 403 /tmp/
 </VirtualHost>
 
        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
 <VirtualHost *:80>
        ServerName matomo.openstreetmap.org
        ServerAlias matomo.osm.org