Merge pull request #792 from roidelapluie/reqtimeout

configure timeouts for apache::mod::reqtimeout

README.md

@@ -23,6 +23,7 @@
         * [Class: apache::mod::fcgid](#class-apachemodfcgid)
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
         * [Class: apache::mod::deflate](#class-apachemoddeflate)
+        * [Class: apache::mod::reqtimeout](#class-apachemodreqtimeout)
         * [Defined Type: apache::vhost](#defined-type-apachevhost)
         * [Parameter: `directories` for apache::vhost](#parameter-directories-for-apachevhost)
         * [SSL parameters for apache::vhost](#ssl-parameters-for-apachevhost)
@@ -745,6 +746,24 @@ An array of mime types that will be deflated.
 
 A hash where the key represents the type and the value represents the note name.
 
+
+####Class: `apache::mod::reqtimeout`
+
+Installs and configures mod_reqtimeout. Defaults to recommended apache
+mod_reqtimeout configuration.
+
+```puppet
+  class { '::apache::mod::reqtimeout':
+    timeouts => ['header=20-40,MinRate=500', 'body=20,MinRate=500'],
+  }
+```
+
+#####`timeouts`
+
+A string or an array that sets the `RequestReadTimeout` option. Defaults to
+`['header=20-40,MinRate=500', 'body=20,MinRate=500']`.
+
+
 ####Defined Type: `apache::vhost`
 
 The Apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost`'s being a defined resource type, which allows it to be evaluated multiple times with different parameters.

manifests/mod/reqtimeout.pp

@@ -1,4 +1,6 @@
-class apache::mod::reqtimeout {
+class apache::mod::reqtimeout (
+  $timeouts = ['header=20-40,minrate=500', 'body=10,minrate=500']
+){
   ::apache::mod { 'reqtimeout': }
   # Template uses no variables
   file { 'reqtimeout.conf':

spec/classes/mod/reqtimeout_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe 'apache::mod::reqtimeout', :type => :class do
+  let :pre_condition do
+    'class { "apache":
+      default_mods => false,
+    }'
+  end
+  context "on a Debian OS" do
+    let :facts do
+      {
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'Debian',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+        :lsbdistcodename        => 'squeeze',
+      }
+    end
+    context "passing no parameters" do
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) }
+    end
+    context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do
+      let :params do
+        {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']}
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) }
+    end
+    context "passing timeouts => 'header=20-60,minrate=600'" do
+      let :params do
+        {:timeouts => 'header=20-60,minrate=600'}
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) }
+    end
+  end
+  context "on a RedHat OS" do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'Redhat',
+        :id                     => 'root',
+        :kernel                 => 'Linux',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    context "passing no parameters" do
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) }
+    end
+    context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do
+      let :params do
+        {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']}
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) }
+    end
+    context "passing timeouts => 'header=20-60,minrate=600'" do
+      let :params do
+        {:timeouts => 'header=20-60,minrate=600'}
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) }
+    end
+  end
+  context "on a FreeBSD OS" do
+    let :facts do
+      {
+        :osfamily               => 'FreeBSD',
+        :operatingsystemrelease => '9',
+        :concat_basedir         => '/dne',
+        :operatingsystem        => 'FreeBSD',
+        :id                     => 'root',
+        :kernel                 => 'FreeBSD',
+        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+      }
+    end
+    context "passing no parameters" do
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-40,minrate=500\nRequestReadTimeout body=10,minrate=500$/) }
+    end
+    context "passing timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']" do
+      let :params do
+        {:timeouts => ['header=20-60,minrate=600', 'body=60,minrate=600']}
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600\nRequestReadTimeout body=60,minrate=600$/) }
+    end
+    context "passing timeouts => 'header=20-60,minrate=600'" do
+      let :params do
+        {:timeouts => 'header=20-60,minrate=600'}
+      end
+      it { is_expected.to contain_class("apache::params") }
+      it { is_expected.to contain_apache__mod('reqtimeout') }
+      it { is_expected.to contain_file('reqtimeout.conf').with_content(/^RequestReadTimeout header=20-60,minrate=600$/) }
+    end
+  end
+end

templates/mod/reqtimeout.conf.erb

@@ -1,2 +1,3 @@
-RequestReadTimeout header=20-40,minrate=500
-RequestReadTimeout body=10,minrate=500
+<% Array(@timeouts).each do |timeout| -%>
+RequestReadTimeout <%= timeout %>
+<%- end -%>