X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6818a060ad9d20217b10428e23f9d6fb9ec9e33a..9584cda7a747710c42f2d4b2bd876c4014f1ad6f:/cookbooks/matomo/templates/default/apache.erb

diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb
index 5b503cae6..525d1fbcc 100644
--- a/cookbooks/matomo/templates/default/apache.erb
+++ b/cookbooks/matomo/templates/default/apache.erb
@@ -8,7 +8,7 @@
 	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
@@ -31,7 +31,7 @@
 	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
 
 	RedirectPermanent / https://matomo.openstreetmap.org/
@@ -44,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/
@@ -83,6 +83,6 @@
 	</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>