From: Grant Slater <github@firefishy.com>
Date: Tue, 12 Mar 2024 13:14:03 +0000 (+0000)
Subject: apache: remove unneeded combined_extended hack for 20.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5c509451353b230ddba785c99d1c7973e4b83b1a

apache: remove unneeded combined_extended hack for 20.04
---

diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb
index a9b4f2c0e..dca3b6610 100644
--- a/cookbooks/apache/templates/default/httpd.conf.erb
+++ b/cookbooks/apache/templates/default/httpd.conf.erb
@@ -64,9 +64,4 @@ AddType application/x-xz .xz
 # Configure logging
 BufferedLogs <%= node[:apache][:buffered_logs] ? "On" : "Off" %>
 
-# Define an extended log format that includes request time and SSL details
-<% if node[:lsb][:release].to_f >= 22.04 -%>
 LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_extended
-<% else -%>
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus" combined_extended
-<% end -%>