turning MaxKeepAliveRequests into a variable

xbezdick · Apr 22, 2014 · a6f92a9 · a6f92a9
1 parent 6218140
commit a6f92a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -49,6 +49,7 @@
   $group                = $::apache::params::group,
   $keepalive            = $::apache::params::keepalive,
   $keepalive_timeout    = $::apache::params::keepalive_timeout,
+  $maxkeepaliverequests = $apache::params::maxkeepaliverequests,
   $logroot              = $::apache::params::logroot,
   $log_level            = $::apache::params::log_level,
   $log_formats          = {},
@@ -270,6 +271,7 @@
     # - $apxs_workaround
     # - $keepalive
     # - $keepalive_timeout
+    # - $maxkeepaliverequests
     # - $server_root
     # - $server_tokens
     # - $server_signature

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -85,6 +85,7 @@
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
+    $maxkeepaliverequests = 100
     $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
@@ -141,6 +142,7 @@
     $conf_template     = 'apache/httpd.conf.erb'
     $keepalive         = 'Off'
     $keepalive_timeout = 15
+    $maxkeepaliverequests = 100
     $fastcgi_lib_path  = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config = '/etc/mime.types'
@@ -199,6 +201,7 @@
     $conf_template        = 'apache/httpd.conf.erb'
     $keepalive            = 'Off'
     $keepalive_timeout    = 15
+    $maxkeepaliverequests = 100
     $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'

diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
@@ -312,7 +312,7 @@ class { 'apache':
   describe 'keepalive' do
     describe 'setup' do
       it 'applies cleanly' do
-        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30' }"
+        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30', maxkeepaliverequests => '200' }"
         apply_manifest(pp, :catch_failures => true)
       end
     end
@@ -321,6 +321,7 @@ class { 'apache':
       it { should be_file }
       it { should contain 'KeepAlive On' }
       it { should contain 'KeepAliveTimeout 30' }
+      it { should contain 'MaxKeepAliveRequests 200' }
     end
   end
 

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
@@ -8,7 +8,7 @@ ServerRoot "<%= @server_root %>"
 PidFile <%= @pidfile %>
 Timeout <%= @timeout %>
 KeepAlive <%= @keepalive %>
-MaxKeepAliveRequests 100
+MaxKeepAliveRequests <%= @maxkeepaliverequests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 
 User <%= @user %>