add logic to ignore maxclients if maxrequestworkers is set

Author: trefzer

manifests/mod/worker.pp

@@ -8,6 +8,7 @@
 #   The max number of simultaneous requests that will be served.
 #   This is the old name and is still supported. The new name is
 #   MaxRequestWorkers as of 2.3.13.
+#   If maxreuestworkers is set, this value is ignored.
 #
 # @param minsparethreads
 #   Minimum number of idle threads to handle request spikes.
@@ -40,6 +41,10 @@
 # @param apache_version
 #   Used to verify that the Apache version you have requested is compatible with the module.
 #
+# @param maxrequestworkers
+#   Maximum number of connections that will be processed simultaneously
+#   if set, maxclients is ignored
+#
 # @see https://httpd.apache.org/docs/current/mod/worker.html for additional documentation.
 #
 class apache::mod::worker (

templates/mod/worker.conf.erb

@@ -2,13 +2,14 @@
   ServerLimit         <%= @serverlimit %>
   StartServers        <%= @startservers %>
   ThreadLimit         <%= @threadlimit %>
-  MaxClients          <%= @maxclients %>
   MinSpareThreads     <%= @minsparethreads %>
   MaxSpareThreads     <%= @maxsparethreads %>
   ThreadsPerChild     <%= @threadsperchild %>
   MaxRequestsPerChild <%= @maxrequestsperchild %>
   ListenBacklog       <%= @listenbacklog %>
   <%- if @maxrequestworkers -%>
-  MaxRequestWorkers   <%= @maxrequestworkers %>
+  MaxRequestWorkers      <%= @maxrequestworkers %>
+  <%- elsif @maxclients -%>
+  MaxClients             <%= @maxclients %>
   <%- end -%>
 </IfModule>