From: Tom Hughes Date: Sun, 10 Mar 2024 13:44:45 +0000 (+0000) Subject: Drop separate secure logs for mediawiki instances X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/9fcfa1aacf134b9db294d03cd9b6ba9a1527f154 Drop separate secure logs for mediawiki instances --- diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb index 31f521fbd..edd901102 100644 --- a/cookbooks/mediawiki/templates/default/apache.erb +++ b/cookbooks/mediawiki/templates/default/apache.erb @@ -8,8 +8,7 @@ ServerAdmin webmaster@openstreetmap.org - LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus" combined_with_time - CustomLog /var/log/apache2/<%= @name %>-access.log combined_with_time + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -28,9 +27,8 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus" combined_with_time - CustomLog /var/log/apache2/<%= @name %>-secure-access.log combined_with_time - ErrorLog /var/log/apache2/<%= @name %>-secure-error.log + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended + ErrorLog /var/log/apache2/<%= @name %>-error.log DocumentRoot <%= @directory %>