From 7e280604b76d6fec65b0849ca5f3a10d8ad6bd38 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 4 Sep 2025 00:49:40 +0100 Subject: [PATCH] apache: Use consistent definition of BufferedLogs --- cookbooks/apache/templates/default/httpd.conf.erb | 2 +- cookbooks/gps-tile/templates/default/apache.erb | 2 -- cookbooks/tile/templates/default/apache.erb | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb index 3f78187f8..bb549eb8e 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -61,7 +61,7 @@ AddDefaultCharset utf-8 # Add extra mime types AddType application/x-xz .xz -# Configure logging +# Configure log buffering BufferedLogs <%= node[:apache][:buffered_logs] ? "On" : "Off" %> # Define an extended log format that includes request time and SSL details diff --git a/cookbooks/gps-tile/templates/default/apache.erb b/cookbooks/gps-tile/templates/default/apache.erb index a1b7ba94c..65ef9f2b4 100644 --- a/cookbooks/gps-tile/templates/default/apache.erb +++ b/cookbooks/gps-tile/templates/default/apache.erb @@ -25,7 +25,6 @@ # Setup logging CustomLog /var/log/apache2/access.log combined_extended ErrorLog /var/log/apache2/error.log - BufferedLogs on # Always set Access-Control-Allow-Origin so that simple CORS requests # will always work and can be cached @@ -53,7 +52,6 @@ # Setup logging CustomLog /var/log/apache2/access.log combined_extended ErrorLog /var/log/apache2/error.log - BufferedLogs on diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 9c94130e2..a45d16bcf 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -62,7 +62,6 @@ LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus \"%{client-geo-continent}i\" \"%{client-geo-country}i\" \"%{client-geo-proxy-description}i\" \"%{client-geo-proxy-type}i\" \"%{geo.proxy_type}i\" \"%{client-geo-conn-type}i\"" combined_fastly_tile_custom CustomLog /var/log/apache2/access.log combined_fastly_tile_custom ErrorLog /var/log/apache2/error.log - BufferedLogs on # Always set Access-Control-Allow-Origin so that simple CORS requests # will always work and can be cached @@ -140,7 +139,6 @@ LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_with_remoteip CustomLog /var/log/apache2/access.log combined_with_remoteip ErrorLog /var/log/apache2/error.log - BufferedLogs on # Always set Access-Control-Allow-Origin so that simple CORS requests # will always work and can be cached -- 2.39.5