apache: fix combined_extended compatibility with Ubuntu 20.04

[chef.git] / cookbooks / apache / templates / default / httpd.conf.erb

diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb
index 3f78187f8b540d37e878184e440b09d138964515..a9b4f2c0e8b84770991684d1c07dc77283a754c5 100644 (file)
--- 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 -%>