From: Grant Slater <github@firefishy.com>
Date: Sun, 10 Mar 2024 20:15:25 +0000 (+0000)
Subject: apache: fix combined_extended compatibility with Ubuntu 20.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/34737a642dc2c4b5d37eb2b1e80bb4b90a63ebbd

apache: fix combined_extended compatibility with Ubuntu 20.04
---

diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb
index 3f78187f8..a9b4f2c0e 100644
--- a/cookbooks/apache/templates/default/httpd.conf.erb
+++ b/cookbooks/apache/templates/default/httpd.conf.erb
@@ -65,4 +65,8 @@ AddType application/x-xz .xz
 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 -%>