From 644f12460af63db5fa70baa490def90dd7374ad7 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 10 Mar 2024 19:49:49 +0000 Subject: [PATCH 1/1] apache: use new combined_extended log format instead of combined --- cookbooks/blogs/templates/default/apache.erb | 6 +++--- cookbooks/chef/templates/default/apache.erb | 4 ++-- cookbooks/civicrm/templates/default/apache.erb | 2 +- cookbooks/dev/templates/default/apache.apis.erb | 4 ++-- cookbooks/dev/templates/default/apache.dev.erb | 4 ++-- cookbooks/dev/templates/default/apache.ooc.erb | 6 +++--- cookbooks/dev/templates/default/apache.phppgadmin.erb | 4 ++-- cookbooks/dev/templates/default/apache.rails.erb | 4 ++-- cookbooks/dev/templates/default/apache.user.erb | 4 ++-- cookbooks/dns/templates/default/apache.erb | 6 +++--- cookbooks/exim/templates/default/apache-mta-sts.erb | 4 ++-- cookbooks/exim/templates/default/apache.erb | 6 +++--- cookbooks/gps-tile/templates/default/apache.erb | 4 ++-- cookbooks/kibana/templates/default/apache.erb | 4 ++-- cookbooks/letsencrypt/templates/default/apache.erb | 4 ++-- cookbooks/mailman/templates/default/apache.erb | 6 +++--- cookbooks/matomo/templates/default/apache.erb | 6 +++--- cookbooks/osqa/templates/default/apache.erb | 6 +++--- cookbooks/otrs/templates/default/apache.erb | 6 +++--- cookbooks/overpass/templates/default/apache.erb | 4 ++-- cookbooks/planet/templates/default/apache.erb | 4 ++-- cookbooks/podman/templates/default/apache.erb | 6 +++--- cookbooks/prometheus/templates/default/apache.erb | 4 ++-- cookbooks/serverinfo/templates/default/apache.erb | 6 +++--- cookbooks/taginfo/templates/default/apache.erb | 6 +++--- 25 files changed, 60 insertions(+), 60 deletions(-) diff --git a/cookbooks/blogs/templates/default/apache.erb b/cookbooks/blogs/templates/default/apache.erb index 507d48b19..e2ae4cf3e 100644 --- a/cookbooks/blogs/templates/default/apache.erb +++ b/cookbooks/blogs/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -26,7 +26,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -41,7 +41,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log DocumentRoot <%= @directory %> diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb index 9d86d910e..917759a7c 100644 --- a/cookbooks/chef/templates/default/apache.erb +++ b/cookbooks/chef/templates/default/apache.erb @@ -5,7 +5,7 @@ ServerAlias chef.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -16,7 +16,7 @@ ServerName chef.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log SSLEngine on diff --git a/cookbooks/civicrm/templates/default/apache.erb b/cookbooks/civicrm/templates/default/apache.erb index fdd0b47fe..7f45c976d 100644 --- a/cookbooks/civicrm/templates/default/apache.erb +++ b/cookbooks/civicrm/templates/default/apache.erb @@ -26,7 +26,7 @@ RewriteRule ^/(.*)$ https://supporting.openstreetmap.org/$1 [R=307,L] - CustomLog /var/log/apache2/join.osmfoundation.org-access.log combined + CustomLog /var/log/apache2/join.osmfoundation.org-access.log combined_extended ErrorLog /var/log/apache2/join.osmfoundation.org-error.log diff --git a/cookbooks/dev/templates/default/apache.apis.erb b/cookbooks/dev/templates/default/apache.apis.erb index c1eddbdb2..4d78fdd6a 100644 --- a/cookbooks/dev/templates/default/apache.apis.erb +++ b/cookbooks/dev/templates/default/apache.apis.erb @@ -8,7 +8,7 @@ SSLCertificateFile /etc/ssl/certs/apis.dev.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/apis.dev.openstreetmap.org.key - CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log DocumentRoot /srv/apis.dev.openstreetmap.org @@ -18,7 +18,7 @@ ServerName apis.dev.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/apis.dev.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ diff --git a/cookbooks/dev/templates/default/apache.dev.erb b/cookbooks/dev/templates/default/apache.dev.erb index 71b73b976..2d3d9473d 100644 --- a/cookbooks/dev/templates/default/apache.dev.erb +++ b/cookbooks/dev/templates/default/apache.dev.erb @@ -8,7 +8,7 @@ SSLCertificateFile /etc/ssl/certs/dev.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/dev.openstreetmap.org.key - CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log DocumentRoot /srv/dev.openstreetmap.org @@ -23,7 +23,7 @@ ServerName dev.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/dev.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ diff --git a/cookbooks/dev/templates/default/apache.ooc.erb b/cookbooks/dev/templates/default/apache.ooc.erb index 6b921e830..0a9b0b979 100644 --- a/cookbooks/dev/templates/default/apache.ooc.erb +++ b/cookbooks/dev/templates/default/apache.ooc.erb @@ -11,7 +11,7 @@ SSLCertificateFile /etc/ssl/certs/ooc.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/ooc.openstreetmap.org.key - CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/ooc.openstreetmap.org-error.log DocumentRoot /srv/ooc.openstreetmap.org/html @@ -28,7 +28,7 @@ ServerAlias c.ooc.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/ooc.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -39,7 +39,7 @@ ServerName npe.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/npe.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/npe.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/npe.openstreetmap.org-error.log RewriteEngine on diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb index fba255781..546a05cbe 100644 --- a/cookbooks/dev/templates/default/apache.phppgadmin.erb +++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb @@ -8,7 +8,7 @@ SSLCertificateFile /etc/ssl/certs/phppgadmin.dev.openstreetmap.org.pem SSLCertificateKeyFile /etc/ssl/private/phppgadmin.dev.openstreetmap.org.key - CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log DocumentRoot /usr/share/phppgadmin @@ -25,7 +25,7 @@ ServerName phppgadmin.dev.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ diff --git a/cookbooks/dev/templates/default/apache.rails.erb b/cookbooks/dev/templates/default/apache.rails.erb index 18b0d77a0..957866c5c 100644 --- a/cookbooks/dev/templates/default/apache.rails.erb +++ b/cookbooks/dev/templates/default/apache.rails.erb @@ -11,7 +11,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log DocumentRoot /srv/<%= @name %>/rails/public @@ -60,7 +60,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb index fb03b6487..373d12258 100644 --- a/cookbooks/dev/templates/default/apache.user.erb +++ b/cookbooks/dev/templates/default/apache.user.erb @@ -23,7 +23,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes RewriteEngine on #LogLevel rewrite:trace2 - CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f @@ -39,7 +39,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes ServerAdmin webmaster@openstreetmap.org ServerAlias <%= @user %>.dev.osm.org - CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ diff --git a/cookbooks/dns/templates/default/apache.erb b/cookbooks/dns/templates/default/apache.erb index 0021d3e82..210f234fe 100644 --- a/cookbooks/dns/templates/default/apache.erb +++ b/cookbooks/dns/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -26,7 +26,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -41,7 +41,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log DocumentRoot <%= @directory %>/html diff --git a/cookbooks/exim/templates/default/apache-mta-sts.erb b/cookbooks/exim/templates/default/apache-mta-sts.erb index 82b787fab..da7ccddba 100644 --- a/cookbooks/exim/templates/default/apache-mta-sts.erb +++ b/cookbooks/exim/templates/default/apache-mta-sts.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -22,7 +22,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log Alias /.well-known/mta-sts.txt <%= @directory %>/<%= domain %>.txt diff --git a/cookbooks/exim/templates/default/apache.erb b/cookbooks/exim/templates/default/apache.erb index f7a5c8ada..505a63a4d 100644 --- a/cookbooks/exim/templates/default/apache.erb +++ b/cookbooks/exim/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -26,7 +26,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -41,6 +41,6 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log diff --git a/cookbooks/gps-tile/templates/default/apache.erb b/cookbooks/gps-tile/templates/default/apache.erb index adc7a061d..9adf707dd 100644 --- a/cookbooks/gps-tile/templates/default/apache.erb +++ b/cookbooks/gps-tile/templates/default/apache.erb @@ -23,7 +23,7 @@ RedirectPermanent /gps-lines/tile /lines # Setup logging - CustomLog /var/log/apache2/access.log combined + CustomLog /var/log/apache2/access.log combined_extended ErrorLog /var/log/apache2/error.log BufferedLogs on @@ -50,7 +50,7 @@ RewriteRule (.*) https://%{SERVER_NAME}/$1 [R=permanent,L] # Setup logging - CustomLog /var/log/apache2/access.log combined + CustomLog /var/log/apache2/access.log combined_extended ErrorLog /var/log/apache2/error.log BufferedLogs on diff --git a/cookbooks/kibana/templates/default/apache.erb b/cookbooks/kibana/templates/default/apache.erb index 0691d8a31..2121eeda2 100644 --- a/cookbooks/kibana/templates/default/apache.erb +++ b/cookbooks/kibana/templates/default/apache.erb @@ -4,7 +4,7 @@ ServerName <%= @site %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @site %>-access.log combined + CustomLog /var/log/apache2/<%= @site %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @site %>-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -15,7 +15,7 @@ ServerName <%= @site %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @site %>-access.log combined + CustomLog /var/log/apache2/<%= @site %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @site %>-error.log SSLEngine on diff --git a/cookbooks/letsencrypt/templates/default/apache.erb b/cookbooks/letsencrypt/templates/default/apache.erb index c49079dae..37d1df528 100644 --- a/cookbooks/letsencrypt/templates/default/apache.erb +++ b/cookbooks/letsencrypt/templates/default/apache.erb @@ -5,7 +5,7 @@ ServerAlias acme.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/acme.openstreetmap.org-error.log DocumentRoot /srv/acme.openstreetmap.org/html @@ -16,7 +16,7 @@ ServerAlias acme.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/acme.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/acme.openstreetmap.org-error.log SSLEngine on diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb index 7b4037c48..6ad616686 100644 --- a/cookbooks/mailman/templates/default/apache.erb +++ b/cookbooks/mailman/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin postmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -26,7 +26,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -42,7 +42,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log LogLevel warn diff --git a/cookbooks/matomo/templates/default/apache.erb b/cookbooks/matomo/templates/default/apache.erb index 5fd21d602..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/ diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb index a62b4813c..375e09c3d 100644 --- a/cookbooks/osqa/templates/default/apache.erb +++ b/cookbooks/osqa/templates/default/apache.erb @@ -9,7 +9,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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,7 +28,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -43,7 +43,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log DocumentRoot <%= @directory %>/osqa diff --git a/cookbooks/otrs/templates/default/apache.erb b/cookbooks/otrs/templates/default/apache.erb index 0a8735c50..a3605a966 100644 --- a/cookbooks/otrs/templates/default/apache.erb +++ b/cookbooks/otrs/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -26,7 +26,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -37,7 +37,7 @@ ServerName <%= @name %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log SSLEngine on diff --git a/cookbooks/overpass/templates/default/apache.erb b/cookbooks/overpass/templates/default/apache.erb index 8ccd28a9d..007e1c287 100644 --- a/cookbooks/overpass/templates/default/apache.erb +++ b/cookbooks/overpass/templates/default/apache.erb @@ -5,7 +5,7 @@ ServerAlias <%= node[:overpass][:fqdn] %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined + CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined_extended ErrorLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-error.log DocumentRoot <%= @directory %> @@ -20,7 +20,7 @@ ServerAlias <%= node[:overpass][:fqdn] %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined + CustomLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-access.log combined_extended ErrorLog /var/log/apache2/<%= node[:overpass][:fqdn] %>-error.log SSLEngine on diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb index 347b32aa0..867d1c6fe 100644 --- a/cookbooks/planet/templates/default/apache.erb +++ b/cookbooks/planet/templates/default/apache.erb @@ -5,7 +5,7 @@ ServerAlias planet.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log SSLEngine on @@ -93,7 +93,7 @@ ServerAlias planet.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/planet.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/planet.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ diff --git a/cookbooks/podman/templates/default/apache.erb b/cookbooks/podman/templates/default/apache.erb index 3c1f510c2..92ca2f4c5 100644 --- a/cookbooks/podman/templates/default/apache.erb +++ b/cookbooks/podman/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -22,7 +22,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log SSLEngine on @@ -37,7 +37,7 @@ ServerName <%= @name %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log SSLEngine on diff --git a/cookbooks/prometheus/templates/default/apache.erb b/cookbooks/prometheus/templates/default/apache.erb index fe910eb18..af0053140 100644 --- a/cookbooks/prometheus/templates/default/apache.erb +++ b/cookbooks/prometheus/templates/default/apache.erb @@ -5,7 +5,7 @@ ServerAlias prometheus.osm.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ @@ -16,7 +16,7 @@ ServerName prometheus.openstreetmap.org ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined + CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined_extended ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log SSLEngine on diff --git a/cookbooks/serverinfo/templates/default/apache.erb b/cookbooks/serverinfo/templates/default/apache.erb index 309f59550..3f4416aa0 100644 --- a/cookbooks/serverinfo/templates/default/apache.erb +++ b/cookbooks/serverinfo/templates/default/apache.erb @@ -7,7 +7,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ @@ -26,7 +26,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -37,7 +37,7 @@ ServerName <%= @name %> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log SSLEngine on diff --git a/cookbooks/taginfo/templates/default/apache.erb b/cookbooks/taginfo/templates/default/apache.erb index 4965a9bc1..6d7dd08b4 100644 --- a/cookbooks/taginfo/templates/default/apache.erb +++ b/cookbooks/taginfo/templates/default/apache.erb @@ -8,7 +8,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log DocumentRoot <%= @directory %> @@ -38,7 +38,7 @@ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key - CustomLog /var/log/apache2/<%= @name %>-access.log combined + CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended ErrorLog /var/log/apache2/<%= @name %>-error.log RedirectPermanent / https://<%= @name %>/ @@ -52,7 +52,7 @@ <% end -%> ServerAdmin webmaster@openstreetmap.org - CustomLog /var/log/apache2/<%= @name %>-access.log combined + 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/ -- 2.39.5