X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba9dff51d4737f22436abe1359d3b24f7f69e8fd..c34d99aba3f7adb752462a83e46829733d73cc61:/cookbooks/matomo/templates/default/apache.erb

diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb
index 45b8bc0f3..525d1fbcc 100644
--- a/cookbooks/matomo/templates/default/apache.erb
+++ b/cookbooks/matomo/templates/default/apache.erb
@@ -2,16 +2,13 @@
 
 <VirtualHost *:443>
 	ServerName matomo.openstreetmap.org
-	ServerAlias 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
+	CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined_extended
 	ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
 	Options -Indexes
@@ -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_extended
+	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
@@ -31,7 +44,7 @@
 	ServerAlias piwik.osm.org
 	ServerAdmin webmaster@openstreetmap.org
 
-	CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined
+	CustomLog /var/log/apache2/matomo.openstreetmap.org-access.log combined_extended
 	ErrorLog /var/log/apache2/matomo.openstreetmap.org-error.log
 
 	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
@@ -44,23 +57,32 @@
 	ExpiresActive On
 	RewriteEngine on
 
-	RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+	RewriteCond "%{HTTP:Accept-Encoding}" "br"
+	RewriteCond "%{REQUEST_FILENAME}\.br" -s
+	RewriteRule "^(.*)\.js" "$1\.js\.br" [QSA]
+
+	RewriteCond "%{HTTP:Accept-Encoding}" "gzip"
 	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
 	RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]
 
-	RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
+	RewriteRule "\.js\.(br|gz)$"  "-" [T=text/javascript,E=no-gzip:1,E=no-brotli:1]
+
+	<FilesMatch "\.js\.br$">
+		Header append Content-Encoding br
+		Header append Vary Accept-Encoding
+	</FilesMatch>
 
 	<FilesMatch "\.js\.gz$">
 		Header append Content-Encoding gzip
 		Header append Vary Accept-Encoding
 	</FilesMatch>
 
-	<FilesMatch "(\.js|\.js\.gz)$">
+	<FilesMatch "(\.js|\.js\.gz|\.js\.br)$">
 		ExpiresDefault "access plus 1 week"
 		Header set Cache-Control "max-age=604800"
 	</FilesMatch>
 
         <FilesMatch ".+\.ph(ar|p|tml)$">
-                SetHandler "proxy:unix:/run/php/matomo.openstreetmap.org.sock|fcgi://127.0.0.1"
+                SetHandler "proxy:unix:/run/php/php-matomo.openstreetmap.org-fpm.sock|fcgi://127.0.0.1"
         </FilesMatch>
 </Directory>