X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3f2535167e3db969a0fee024dbfa43997fa6c9f8..a75d9db67025eeb4db19abdb36a6a870a6ea0dc4:/cookbooks/apache/templates/default/httpd.conf.erb?ds=inline diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb index 73e59c725..62533efae 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -1,5 +1,8 @@ # DO NOT EDIT - This file is being maintained by Chef +# Enable HTTP/2 over TLS +Protocols h2 http/1.1 + # Set the number of seconds before receives and sends time out Timeout <%= node[:apache][:timeout] %> @@ -14,8 +17,8 @@ ServerLimit <%= node[:apache][:prefork][:server_limit] %> <% end -%> MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %> MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %> -MaxClients <%= node[:apache][:prefork][:max_clients] %> -MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %> +MaxRequestWorkers <%= node[:apache][:prefork][:max_request_workers] %> +MaxConnectionsPerChild <%= node[:apache][:prefork][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "worker" -%> @@ -28,8 +31,8 @@ MinSpareThreads <%= node[:apache][:worker][:min_spare_threads] %> MaxSpareThreads <%= node[:apache][:worker][:max_spare_threads] %> ThreadLimit <%= node[:apache][:worker][:thread_limit] %> ThreadsPerChild <%= node[:apache][:worker][:threads_per_child] %> -MaxClients <%= node[:apache][:worker][:max_clients] %> -MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %> +MaxRequestWorkers <%= node[:apache][:worker][:max_request_workers] %> +MaxConnectionsPerChild <%= node[:apache][:worker][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "event" -%> @@ -42,11 +45,21 @@ MinSpareThreads <%= node[:apache][:event][:min_spare_threads] %> MaxSpareThreads <%= node[:apache][:event][:max_spare_threads] %> ThreadLimit <%= node[:apache][:event][:thread_limit] %> ThreadsPerChild <%= node[:apache][:event][:threads_per_child] %> -MaxClients <%= node[:apache][:event][:max_clients] %> -MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %> +MaxRequestWorkers <%= node[:apache][:event][:max_request_workers] %> +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 AddDefaultCharset utf-8 +# Add extra mime types +AddType application/x-xz .xz + +# Configure logging BufferedLogs <%= node[:apache][:buffered_logs] ? "On" : "Off" %>