X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bfd0f6bf2cc877667f039f2fc4a1e34e1dd7cd39..9ec9b4282d67468872e5162410cba6b624f5c388:/cookbooks/apache/templates/default/httpd.conf.erb?ds=sidebyside diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb index 81c8f6e9f..a9b4f2c0e 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -50,6 +50,9 @@ MaxConnectionsPerChild <%= node[:apache][:event][:max_connections_per_child] %> <% if node[:apache][:event][:async_request_worker_factor] -%> AsyncRequestWorkerFactor <%= node[:apache][:event][:async_request_worker_factor] %> <% end -%> +<% if node[:apache][:event][:listen_cores_buckets_ratio] -%> +ListenCoresBucketsRatio <%= node[:apache][:event][:listen_cores_buckets_ratio] %> +<% end -%> <% end -%> # Default to UTF-8 @@ -60,3 +63,10 @@ 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 -%>